Merge pull request #115 from duncanmmacleod/main-args

Support args in htgettoken.main()

Author: DrDaveD

htgettoken.spec

@@ -81,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 # - Fix htdecodetoken to work with token files that do not end in a newline.
+# - Support args in htgettoken.main() Python entry point.
 
 * Thu Jul 25 2024 Dave Dykstra <dwd@fnal.gov> 2.0-2
 - Fix broken httokendecode symlink.

htgettoken/__init__.py

@@ -499,7 +499,7 @@ def ttl2secs(ttl, msg):
 
 
 ### htgettoken main ####
-def main():
+def main(args=None):
     global options
     usagestr = "usage: %prog [-h] [otheroptions]"
     parser = OptionParser(usage=usagestr, version=version, prog=prog)
@@ -630,8 +630,10 @@ def main():
     # look for default options in the environment
     envopts = os.getenv("HTGETTOKENOPTS", "")
     envargs = shlex.split(envopts, True)
+    if args is None:
+        args = sys.argv[1:]
 
-    parseargs(parser, envargs + sys.argv[1:])
+    parseargs(parser, envargs + list(args))
 
     if options.optserver is not None:
         # read additional options from optserver