diff --git a/TODO b/TODO index fb87c65..e69de29 100644 --- a/TODO +++ b/TODO @@ -1,3 +0,0 @@ -- Change -v option to use PrintStdout() instead of print -- Change Python skeleton to automatically include OPTIONSLIST into the help menu -- Fix document generation with latest version of restructured text diff --git a/py/program.py b/py/program.py index 72d252d..db76c54 100755 --- a/py/program.py +++ b/py/program.py @@ -101,7 +101,7 @@ ##### uTable = [PROGVER, - "usage: " + PROGNAME + " [-fhv]", + "usage: " + PROGNAME + " [%s]" % OPTIONSLIST, " where,", " -f file configuration file to use", " -h print this help information", @@ -252,7 +252,7 @@ sys.exit(0) if opt == "-v": - print CVSID + PrintStdout(CVSID) sys.exit(0) # Processing of the configuration file below requires installation of