Changeset 2829 for pykota/trunk/bin/cupspykota

Timestamp:

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

Author:

jerome

Message:

Did a pass with pylint.

Files:

• pykota/trunk/bin/cupspykota (modified) (5 diffs)

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 :