Changeset 3330 for pykota/trunk/bin/pykosd

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.

Files:

• pykota/trunk/bin/pykosd (modified) (4 diffs)

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,