Changeset 2829

Timestamp:

04/04/06 11:16:53 (18 years ago)

Author:

jerome

Message:

Did a pass with pylint.

Location:

pykota/trunk/bin

Files:

• cupspykota (modified) (5 diffs)
• dumpykota (modified) (1 diff)
• edpykota (modified) (1 diff)
• pkbcodes (modified) (1 diff)
• pkmail (modified) (1 diff)
• pknotify (modified) (2 diffs)
• pkprinters (modified) (2 diffs)
• pkturnkey (modified) (3 diffs)
• pkusers (modified) (1 diff)
• pykosd (modified) (1 diff)
• pykotme (modified) (1 diff)
• warnpykota (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -47 +47 @@
 from pykota.accounter import openAccounter
 from pykota.ipp import IPPRequest, IPPError
-from pykota.storage import PyKotaStorageError
         
 class FakeObject :        
+    """Fake object."""
     def __init__(self, name) :
         """Fake init."""
@@ -135 +135 @@
                 # see if the pid contained in the lock file is still running
                 os.kill(pid, 0)
-            except OSError, e :    
-                if e.errno != errno.EPERM :
+            except OSError, err :
+                if err.errno != errno.EPERM :
                     # process doesn't exist anymore
                     os.remove(lockfilename)
@@ -318 +318 @@
             self.regainPriv()                         
             inputfile = os.popen(jobticketcommand, "r")
-            for line in inputfile.xreadlines() :
-                line = line.strip()
-                if line in ("DENY", "AUTH=NO", "AUTH=IMPOSSIBLE") :
-                    self.logdebug("Seen %s command." % line)
-                    action = "DENY"
-                elif line == "CANCEL" :
-                    self.logdebug("Seen CANCEL command.")
-                    action = "CANCEL"
-                elif line.startswith("USERNAME=") :    
-                    username = line.split("=", 1)[1].strip()
-                    self.logdebug("Seen new username [%s]" % username)
-                elif line.startswith("BILLINGCODE=") :    
-                    billingcode = line.split("=", 1)[1].strip()
-                    self.logdebug("Seen new billing code [%s]" % billingcode)
+            try :
+                for line in inputfile.xreadlines() :
+                    line = line.strip()
+                    if line in ("DENY", "AUTH=NO", "AUTH=IMPOSSIBLE") :
+                        self.logdebug("Seen %s command." % line)
+                        action = "DENY"
+                    elif line == "CANCEL" :
+                        self.logdebug("Seen CANCEL command.")
+                        action = "CANCEL"
+                    elif line.startswith("USERNAME=") :    
+                        username = line.split("=", 1)[1].strip()
+                        self.logdebug("Seen new username [%s]" % username)
+                    elif line.startswith("BILLINGCODE=") :    
+                        billingcode = line.split("=", 1)[1].strip()
+                        self.logdebug("Seen new billing code [%s]" % billingcode)
+            except IOError, msg :            
+                self.logdebug("IOError while reading subprocess' output : %s" % msg)
             inputfile.close()    
             self.dropPriv()
@@ -452 +455 @@
         
         class DummyClass :
+            """Class used to avoid errors."""
             operation_attributes = {}
             job_attributes = {}
@@ -1254 +1258 @@
             wrapper.printInfo(_("Job %s interrupted by the administrator !") % wrapper.JobId, "warn")
             retcode = 0
-        except SystemExit, e :    
-            retcode = e.code
+        except SystemExit, err :    
+            retcode = err.code
         except :    
             try :

pykota/trunk/bin/dumpykota

@@ -26 +26 @@
 
 import sys
-import os
 
-from pykota import version
-from pykota.tool import PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import PyKotaCommandLineError, crashed, N_
 from pykota.dumper import DumPyKota
 

pykota/trunk/bin/edpykota

@@ -26 +26 @@
 
 import sys
-import os
-
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
-from pykota.config import PyKotaConfigError
-from pykota.storage import PyKotaStorageError, StorageUserPQuota, StorageGroupPQuota
+
+from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.storage import StorageUserPQuota, StorageGroupPQuota
 
 __doc__ = N_("""edpykota v%(__version__)s (c) %(__years__)s %(__author__)s

pykota/trunk/bin/pkbcodes

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
 from pykota.storage import StorageBillingCode
 

pykota/trunk/bin/pkmail

@@ -31 +31 @@
 import email
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
     
 __doc__ = N_("""pkmail v%(__version__)s (c) %(__years__)s %(__author__)s

pykota/trunk/bin/pknotify

@@ -26 +26 @@
 
 import sys
-import os
-import popen2
 import socket
 import signal
@@ -39 +37 @@
     hasPAM = 1
 
-from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Tool, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""pknotify v%(__version__)s (c) %(__years__)s %(__author__)s

pykota/trunk/bin/pkprinters

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
 from pykota.storage import StoragePrinter
 
@@ -227 +227 @@
                         if self.isValidName(pname) :
                             printer = StoragePrinter(self.storage, pname)
-                            self.modifyPrinter(printer, charges, perpage, perjob,\
+                            self.modifyPrinter(printer, charges, perpage, perjob, \
                                            description, passthrough, \
                                            nopassthrough, maxjobsize)

pykota/trunk/bin/pkturnkey

@@ -223 +223 @@
         try :
             from pysnmp.asn1.encoding.ber.error import TypeMismatchError
-            from pysnmp.mapping.udp.error import SnmpOverUdpError
             from pysnmp.mapping.udp.role import Manager
             from pysnmp.proto.api import alpha
@@ -247 +246 @@
             tsp.close()
         
-        def handleAnswer(wholeMsg, notusedhere, req):
+        def handleAnswer(wholemsg, notusedhere, req):
             """Decodes and handles the SNMP answer."""
             ver = alpha.protoVersions[alpha.protoVersionId1]
             rsp = ver.Message()
             try :
-                rsp.berDecode(wholeMsg)
+                rsp.berDecode(wholemsg)
             except TypeMismatchError, msg :    
                 raise "No SNMP !"
@@ -364 +363 @@
         """Intializes PyKota's database."""
         if not self.config.isAdmin :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0],\
+            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], \
                                    _("You're not allowed to use this command."))
             

pykota/trunk/bin/pkusers

@@ -25 +25 @@
 #
 
-import os
 import sys
 import pwd
 import grp
 
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
 from pykota.storage import StorageUser, StorageGroup
 

pykota/trunk/bin/pykosd

@@ -79 +79 @@
 
 class PyKOSD(PyKotaTool) :
+    """A class for an On Screen Display print quota monitor."""
     def main(self, args, options) :
         """Main function starts here."""

pykota/trunk/bin/pykotme

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
 
 try :

pykota/trunk/bin/warnpykota

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
-from pykota.config import PyKotaConfigError
-from pykota.storage import PyKotaStorageError
+from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""warnpykota v%(__version__)s (c) %(__years__)s %(__author__)s