From: <ki...@us...> - 2003-03-26 01:13:19
|
Update of /cvsroot/pymerase/pymerase/pymerase In directory sc8-pr-cvs1:/tmp/cvs-serv17196 Modified Files: __init__.py Log Message: fixed copyright date, remove command line code which had been moved to pymerase/bin/pymerase Index: __init__.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/pymerase/__init__.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** __init__.py 14 Feb 2003 00:59:36 -0000 1.29 --- __init__.py 26 Mar 2003 01:13:14 -0000 1.30 *************** *** 3,7 **** # # # C O P Y R I G H T N O T I C E # ! # Copyright (c) 2001 by: # # * California Institute of Technology # # # --- 3,7 ---- # # # C O P Y R I G H T N O T I C E # ! # Copyright (c) 2002 by: # # * California Institute of Technology # # # *************** *** 35,39 **** from __future__ import nested_scopes - import getopt import glob import imp --- 35,38 ---- *************** *** 305,339 **** ############################### # Code to handle parsing command line arguments ! def printUsage(): ! usage = """ ! Welcome to PyMerase %s! ! ! Usage: ! pymerase -s [source] -i [inputModule] ! -d [destination] -o [outputModule] ! ! pymerase --source=[source] --inputModule=[inputModule] ! --destination=[destination] --outputModule=[outputModule] ! ! Options: ! -s, --source=[foo] Location of input file or directory ! -i, --inputModule=[foo] Name of PyMerase input translation module ! -d, --destination=[foo] Location of output file or directory ! -o, --outputModule=[foo] Name of PyMerase output module ! ! -t, --translators Displays more info about translators ! -h, --help Displays this help page ! ! Input Translators Available: ! %s ! ! Output Translators Available: ! %s ! """ % (VERSION, ! getInputTranslatorString(), ! getOutputTranslatorString()) ! ! print usage ! def getOutputTranslatorList(): """ --- 304,308 ---- ############################### # Code to handle parsing command line arguments ! # FIXME: Should be moved? def getOutputTranslatorList(): """ *************** *** 439,567 **** - def printTranslators(): - text = """ - Pymerase Translators: - INPUT: - %s - OUTPUT: - %s - """ % (getInputTranslatorVerbose(), getOutputTranslatorVerbose()) - - print text - def parseCommandLine(): - """ - Processes Command Line Arguments - - return (source, inputModule, destination, outputModule) - """ - try: - opts, args = getopt.getopt(sys.argv[1:], "s:i:d:o:ht", - ["source=", - "inputModule=", - "destination=", - "outputModule=", - "help", - "translators"]) - except getopt.GetoptError: - printUsage() - print "-------------------------------" - print "- Invalid Command Line Option -" - print "-------------------------------" - sys.exit(2) - - if len(sys.argv) <= 1: - printUsage() - sys.exit(2) - - for arg, val in opts: - if arg in ('-h', '--help'): - printUsage() - sys.exit() - - if arg in ('-t', '--translators'): - printTranslators() - sys.exit() - - if arg in ('-s', '--source'): - if len(val) > 0: - source = val - else: - source = None - - if arg in ('-i', '--inputModule'): - if len(val) > 0: - inputModule = val - else: - inpurModule = None - - if arg in ('-d', '--destination'): - if len(val) > 0: - destination = val - else: - destination = None - - if arg in ('-o', '--outputModule'): - if len(val) > 0: - outputModule = val - else: - outputModule = None - - print "" - - try: - print "source: %s" % (source) - except UnboundLocalError: - source = None - - try: - print "inputModule: %s" % (inputModule) - except UnboundLocalError: - inputModule = None - - try: - print "destination: %s" % (destination) - except UnboundLocalError: - destination = None - - try: - print "outputModule: %s" % (outputModule) - except UnboundLocalError: - outputModule = None - - print "" - - - msg = "" - if source is None: - msg += "Error: No source provided" - msg += os.linesep - if inputModule is None: - msg += "Error: No inputModule provided" - msg += os.linesep - if destination is None: - msg += "Error: No destination provided" - msg += os.linesep - if outputModule is None: - msg += "Error: No outputModule provided" - msg += os.linesep - if msg != "": - msg += "Suggestion: see \'pymerase --help\'" - msg += os.linesep - print msg - sys.exit(2) - - return (source, inputModule, destination, outputModule) - - if __name__ == '__main__': ! ! source, inputModule, destination, outputModule = \ ! parseCommandLine() ! ! parser = run(source, inputModule, destination, outputModule) --- 408,418 ---- if __name__ == '__main__': ! #Commnad line feature moved to pymerase/bin/pymerase ! pass |