Changeset 574

Timestamp:

03/11/05 23:14:35 (19 years ago)

Author:

jerome

Message:

Moved some methods

Files:

• tea4cups/trunk/cupsoftee (modified) (4 diffs)

tea4cups/trunk/cupsoftee

@@ -63 +63 @@
             self.config = FakeConfig()
             self.debug = 1      # no config, so force debug mode !
+        
+    def logDebug(self, message) :    
+        """Logs something to debug output if debug is enabled."""
+        if self.debug :
+            sys.stderr.write("DEBUG: %s\n" % message)
+            sys.stderr.flush()
             
+    def logInfo(self, message, level="info") :        
+        """Logs a message to CUPS' error_log file."""
+        sys.stderr.write("%s: %s\n" % (level.upper(), message))
+        sys.stderr.flush()
+        
     def isTrue(self, option) :        
         """Returns 1 if option is set to true, else 0."""
@@ -81 +92 @@
                 raise ConfigError, "Option %s not found in section global of %s" % (option, self.conffile)
                 
-    def getSectionOption(self, sectionname, option) :    
+    def getSectionOption(self, printqueuename, option) :    
         """Returns an option from the printer section, or the global section, or raises a ConfigError."""
         globaloption = self.getGlobalOption(option, ignore=1)
         try :
-            return self.config.get(sectionname, option, raw=1)
+            return self.config.get(printqueuename, option, raw=1)
         except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
             if globaloption is not None :
                 return globaloption
             else :
-                raise ConfigError, "Option %s not found in section [%s] of %s" % (option, sectionname, self.conffile)
+                raise ConfigError, "Option %s not found in section [%s] of %s" % (option, printqueuename, self.conffile)
                 
-    def enumTeeBranches(self, sectionname) :
+    def enumTeeBranches(self, printqueuename) :
         """Returns the list of branches for a particular section's Tee."""
         try :
@@ -100 +111 @@
             globalbranches = []
         try :
-            sectionbranches = [ (k, v) for (k, v) in self.config.items(sectionname) if k.startswith("tee_") ]
+            sectionbranches = [ (k, v) for (k, v) in self.config.items(printqueuename) if k.startswith("tee_") ]
         except ConfigParser.NoSectionError, msg :    
             self.printInfo("Invalid configuration file : %s" % msg, "error")
@@ -229 +240 @@
                     sys.argv[5], \
                     backend)
-        
-    def logDebug(self, message) :    
-        """Logs something to debug output if debug is enabled."""
-        if self.debug :
-            sys.stderr.write("DEBUG: %s\n" % message)
-            sys.stderr.flush()
-            
-    def logInfo(self, message, level="info") :        
-        """Logs a message to CUPS' error_log file."""
-        sys.stderr.write("%s: %s\n" % (level.upper(), message))
-        sys.stderr.flush()
 
 if __name__ == "__main__" :