Changeset 643

Timestamp:

06/12/05 22:29:06 (19 years ago)

Author:

jerome

Message:

Fixed some code which wouldn't have run on Python2.1.
Fixed some code which made the bad assumption that
dictionnary.items() is always sorted : this was just luck !

Files:

• tea4cups/trunk/tea4cups (modified) (6 diffs)

tea4cups/trunk/tea4cups

@@ -557 +557 @@
         signal.signal(signal.SIGTERM, self.sigtermHandler)
         serialize = self.isTrue(self.getPrintQueueOption(self.PrinterName, "serialize", ignore=1))
-        self.pipes = { 0: (0,1) }
+        self.pipes = { 0: (0, 1) }
         branches = self.enumBranches(self.PrinterName, "prehook")
         for b in branches :
             self.pipes[b.split("_", 1)[1]] = os.pipe()
         retcode = self.runCommands("prehook", branches, serialize)
-        for p in self.pipes.items()[1:] :
+        for p in [ (k, v) for (k, v) in self.pipes.items() if k != 0 ] :
             os.close(p[1][1])
         if not self.isCancelled and not self.gotSigTerm :
@@ -572 +572 @@
                 if self.runCommands("posthook", branches, serialize) :
                     self.logInfo("An error occured during the execution of posthooks.", "warn")
-        for p in self.pipes.items()[1:] :
+        for p in [ (k, v) for (k, v) in self.pipes.items() if k != 0 ] :
             os.close(p[1][0])
         signal.signal(signal.SIGTERM, signal.SIG_IGN)
@@ -607 +607 @@
         self.logDebug("Launching %s : %s" % (branch, command))
         btype, bname = branch.split("_", 1)
-        if bname not in self.pipes :
+        if bname not in self.pipes.keys() :
             bname = 0
         if btype == "prehook" :
@@ -677 +677 @@
                 f.close()
             try :
-                os.execve(originalbackend,arguments,os.environ)
+                os.execve(originalbackend, arguments, os.environ)
             except OSError, msg :
                 self.logDebug("execve() failed: %s" % msg)
@@ -693 +693 @@
             status = os.WEXITSTATUS(status)
             if status :
-              self.logInfo("CUPS backend %s returned %d." % (originalbackend, status), "error")
+              self.logInfo("CUPS backend %s returned %d." % (originalbackend,\
+                                                             status), "error")
             return status
         elif not killed :
-            self.logInfo("CUPS backend %s died abnormally." % originalbackend, "error")
+            self.logInfo("CUPS backend %s died abnormally." % originalbackend,\
+                                                              "error")
             return -1
         else :
@@ -726 +728 @@
             for line in traceback.format_exception(*sys.exc_info()) :
                 lines.extend([l for l in line.split("\n") if l])
-            msg = "ERROR: ".join(["%s (PID %s) : %s\n" % (wrapper.MyName, wrapper.pid, l) for l in (["ERROR: Tea4CUPS v%s" % version] + lines)])
+            msg = "ERROR: ".join(["%s (PID %s) : %s\n" % (wrapper.MyName, \
+                                                          wrapper.pid, l) \
+                        for l in (["ERROR: Tea4CUPS v%s" % version] + lines)])
             sys.stderr.write(msg)
             sys.stderr.flush()