Changeset 627

Timestamp:

05/07/05 20:53:15 (20 years ago)

Author:

jerome

Message:

Fix for Python 2.1

Location:

tea4cups/trunk

Files:

• NEWS (modified) (1 diff)
• README (modified) (1 diff)
• tea4cups (modified) (1 diff)

tea4cups/trunk/NEWS

@@ -24 +24 @@
   * 2.11 :
   
+    - Now works with old releases of Python (>= 2.1)
+    
     - More powerful error handling at startup time.
     

tea4cups/trunk/README

@@ -74 +74 @@
 PyKota v1.22alpha2 or higher to avoid a race condition.
 
+NB : Tea4CUPS requires a version of Python >= 2.1
+
 =============================================================================
 

tea4cups/trunk/tea4cups

@@ -284 +284 @@
         branchbasename = "%s_" % branchtype.lower()
         try :
-            globalbranches = [ (k, v) for (k, v) in self.config.items("global") if k.startswith(branchbasename) ]
+            # globalbranches = [ (k, v) for (k, v) in self.config.items("global") if k.startswith(branchbasename) ]
+            globalbranches = [ (k, self.config.get("global", k)) for k in self.config.options("global") if k.startswith(branchbasename) ]
         except ConfigParser.NoSectionError, msg :    
             raise ConfigError, "Invalid configuration file : %s" % msg
         try :
-            sectionbranches = [ (k, v) for (k, v) in self.config.items(printqueuename) if k.startswith(branchbasename) ]
+            # sectionbranches = [ (k, v) for (k, v) in self.config.items(printqueuename) if k.startswith(branchbasename) ]
+            sectionbranches = [ (k, self.config.get(printqueuename, k)) for k in self.config.options(printqueuename) if k.startswith(branchbasename) ]
         except ConfigParser.NoSectionError, msg :    
             self.logInfo("No section for print queue %s : %s" % (printqueuename, msg))