Changeset 802

Timestamp:

12/15/2005 07:29:14 PM (3 years ago)

Author:

chris

Message:

Removed options.version which was causing an immediate exception on
startup as verbose is handled internally by optparse.

Fixed parser.error() call which requires an argument.

Updated version message versionMsg.

This is all further to work on ticket #5.

Files:

• eddie/trunk/bin/eddie.py (modified) (2 diffs)

eddie/trunk/bin/eddie.py

@@ -332 +332 @@
     # define usage and version messages
     usageMsg = "usage: %prog [options]"
-    versionMsg = """EDDIE (c) Chris Miles and Rod Telford 1998-2002
-  chris@psychofx.com / rtelford@psychofx.com
-  Version: %s""" % __version__
-    
+    versionMsg = """EDDIE Tool %s""" % __version__
+
     # get a parser object and define our options
     parser = optparse.OptionParser(usage=usageMsg, version=versionMsg)
@@ -346 +344 @@
     parser.set_defaults(showconfig=False, verbose=False,        \
                         config=default_config_file)
-    
+
     # Parse.  We dont accept arguments, so we complain if they're found.
     (options, args) = parser.parse_args()
     if len(args) != 0:
-        parser.error()
-    if options.version == True:
-        print(versionMsg)
-        eddieexit()
+        parser.error('No extra arguments should be given')
+
     # All good - return the option dict
     return options