Changeset 3330

Timestamp:

02/03/08 13:17:21 (16 years ago)

Author:

jerome

Message:

Reduced the scope of some import statements.
Fixed some minor problems.
Fixed a bug in pykosd where the --color command line option was used.

Location:

pykota/trunk

Files:

• bin/autopykota (modified) (2 diffs)
• bin/pkbanner (modified) (2 diffs)
• bin/pykosd (modified) (4 diffs)
• bin/warnpykota (modified) (2 diffs)
• pykota/appinit.py (modified) (1 diff)

pykota/trunk/bin/autopykota

@@ -23 +23 @@
 #
 
-import sys
-import os
-
-import pykota.appinit
-from pykota.utils import *
-from pykota.commandline import PyKotaOptionParser
-from pykota.errors import PyKotaToolError
-from pykota.tool import PyKotaTool
-
 """A tool to automate user account creation and initial balance setting.
 
@@ -39 +30 @@
 OF AN external policy IN pykota.conf
 """
+
+import sys
+import os
+
+import pykota.appinit
+from pykota.utils import run
+from pykota.commandline import PyKotaOptionParser
+from pykota.errors import PyKotaToolError
+from pykota.tool import PyKotaTool
 
 class AutoPyKota(PyKotaTool) :

pykota/trunk/bin/pkbanner

@@ -47 +47 @@
     
 import pykota.appinit
-from pykota.utils import *
+from pykota.utils import run, loginvalidparam
 from pykota.commandline import PyKotaOptionParser
 
@@ -241 +241 @@
 
 if __name__ == "__main__" :
-    def checkandset_pagesize(option, opt, value, parser) :
+    def checkandset_pagesize(option, opt, value, optionparser) :
         """Checks and sets the page size."""
         if getPageSize(value) is None :
             loginvalidparam(opt, value, option.default)
-            setattr(parser.values, option.dest, option.default)
+            setattr(optionparser.values, option.dest, option.default)
         else :    
-            setattr(parser.values, option.dest, value)
-        
-    def checkandset_savetoner(option, opt, value, parser) :    
+            setattr(optionparser.values, option.dest, value)
+        
+    def checkandset_savetoner(option, opt, value, optionparser) :    
         """Checks and sets the save toner value."""
         if (value < 0.0) or (value > 99.0) :
             loginvalidparam(opt, value, option.default, \
                             _("Allowed range is (0..99)"))
-            setattr(parser.values, option.dest, option.default)
+            setattr(optionparser.values, option.dest, option.default)
         else :    
-            setattr(parser.values, option.dest, value / 100.0)
+            setattr(optionparser.values, option.dest, value / 100.0)
         
     # TODO : --papertray : to print banners on a different paper (colored for example)

pykota/trunk/bin/pykosd

@@ -22 +22 @@
 #
 
+"""An On Screen Display (OSD) monitor for PyKota's end users."""
+
 import sys
 import os
@@ -30 +32 @@
     import pyosd
 except ImportError :    
-    logerr("Sorry ! You need both xosd and the Python OSD library (pyosd) for this software to work.\n")
+    sys.stderr.write("Sorry ! You need both xosd and the Python OSD library (pyosd) for this software to work.\n")
     sys.exit(-1)
 
 import pykota.appinit
-from pykota.utils import *
+from pykota.utils import run, loginvalidparam
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaToolError, PyKotaCommandLineError
 from pykota.tool import PyKotaTool
-
-"""An On Screen Display (OSD) monitor for PyKota's end users."""
 
 class PyKOSD(PyKotaTool) :
@@ -125 +125 @@
         
 if __name__ == "__main__" :
-    def checkandset_positiveint(option, opt, value, parser) :    
+    def checkandset_positiveint(option, opt, value, optionparser) :    
         """Checks and sets positive integer values."""
         if value < 0 :
             loginvalidparam(opt, value, option.default)
-            setattr(parser.values, option.dest, option.default)
+            setattr(optionparser.values, option.dest, option.default)
         else :    
-            setattr(parser.values, option.dest, value)
+            setattr(optionparser.values, option.dest, value)
             
-    def checkandset_color(option, opt, value, parser) :    
+    def checkandset_color(option, opt, value, optionparser) :    
         """Checks and sets the color value."""
         if not value.startswith("#") :
@@ -145 +145 @@
         if (len(value) != 7) or error :
             loginvalidparam(opt, value, option.default)
-            setattr(parser.values, option.dest, option.default)
+            setattr(optionparser.values, option.dest, option.default)
         else :    
-            setattr(parser.values, option.dest, value)
+            setattr(optionparser.values, option.dest, value)
             
     parser = PyKotaOptionParser(description=_("An On Screen Display (OSD) monitor for PyKota's end users."))
     parser.add_option("-c", "--color", "--colour",
+                            type="string",
                             action="callback",
                             callback=checkandset_color,

pykota/trunk/bin/warnpykota

@@ -22 +22 @@
 #
 
+"""This command line tool can automatically send periodic email
+notifications to users or groups who have reached the limit of their
+printing quota."""
+        
 import sys
 import os
@@ -32 +36 @@
 
 import pykota.appinit
-from pykota.utils import *
+from pykota.utils import run
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaCommandLineError
 from pykota.tool import PyKotaTool
 
-"""This command line tool can automatically send periodic email
-notifications to users or groups who have reached the limit of their
-printing quota."""
-        
 class WarnPyKota(PyKotaTool) :        
     """A class for warnpykota."""

pykota/trunk/pykota/appinit.py

@@ -27 +27 @@
 import gettext
 
-from pykota.utils import *
+from pykota.utils import initlocale, initgettext
 
 (lang, charset) = initlocale(os.environ.get("PYKOTALANG", ""),