Changeset 2344 for pykota/trunk/pykota/tool.py

Timestamp:

07/08/05 18:52:50 (19 years ago)

Author:

jerome

Message:

Moved the GPL blurb into a single location.
Now uses named parameters in commands' help.

Files:

• pykota/trunk/pykota/tool.py (modified) (7 diffs)

pykota/trunk/pykota/tool.py

@@ -40 +40 @@
 from mx import DateTime
 
-from pykota import version, config, storage, logger, accounter, pdlanalyzer
+from pykota import config, storage, logger, accounter, pdlanalyzer
+from pykota.version import __version__, __author__, __years__, __gplblurb__
 
 def N_(message) :
@@ -61 +62 @@
     for line in traceback.format_exception(*sys.exc_info()) :
         lines.extend([l for l in line.split("\n") if l])
-    msg = "ERROR: ".join(["%s\n" % l for l in (["ERROR: PyKota v%s" % version.__version__, message] + lines)])
+    msg = "ERROR: ".join(["%s\n" % l for l in (["ERROR: PyKota v%s" % __version__, message] + lines)])
     sys.stderr.write(msg)
     sys.stderr.flush()
@@ -68 +69 @@
 class Tool :
     """Base class for tools with no database access."""
-    def __init__(self, lang="", charset=None, doc="PyKota v%s (c) %s %s" % (version.__version__, version.__copyright__, version.__author__)) :
+    def __init__(self, lang="", charset=None, doc="PyKota v%(__version__)s (c) %(__years__)s %(__author__)s") :
         """Initializes the command line tool."""
         # did we drop priviledges ?
@@ -206 +207 @@
         except AttributeError :    
             pass
-        print version.__version__
+        print __version__
         sys.exit(0)
     
@@ -215 +216 @@
         except AttributeError :    
             pass
-        print _(self.documentation) % (version.__version__, version.__copyright__, version.__author__, version.__author__)
+        print _(self.documentation) % globals()
+        print __gplblurb__
+        print
+        print _("Please report bugs to :"), __author__
         sys.exit(0)
         
@@ -232 +236 @@
                 server.sendmail(admin, [admin, crashrecipient], \
                                        "From: %s\nTo: %s\nCc: %s\nSubject: PyKota v%s crash traceback !\n\n%s" % \
-                                       (admin, crashrecipient, admin, version.__version__, fullmessage))
+                                       (admin, crashrecipient, admin, __version__, fullmessage))
                 server.quit()
         except :
@@ -299 +303 @@
 class PyKotaTool(Tool) :    
     """Base class for all PyKota command line tools."""
-    def __init__(self, lang="", charset=None, doc="PyKota %s (c) 2003-2004 %s" % (version.__version__, version.__author__)) :
+    def __init__(self, lang="", charset=None, doc="PyKota v%(__version__)s (c) %(__years__)s %(__author__)s") :
         """Initializes the command line tool and opens the database."""
         Tool.__init__(self, lang, charset, doc)