Changeset 1218

Timestamp:

11/25/03 23:37:22 (21 years ago)

Author:

jalet

Message:

Small code move

Location:

pykota/trunk/pykota

Files:

• logger.py (modified) (2 diffs)
• tool.py (modified) (4 diffs)

pykota/trunk/pykota/logger.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.10  2003/11/25 22:37:22  jalet
+# Small code move
+#
 # Revision 1.9  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -66 +69 @@
     __str__ = __repr__
 
-def openLogger(pykotatool) :
+def openLogger(pykotatool, backend) :
     """Returns the appropriate logger subsystem object."""
-    backend = pykotatool.config.getLoggingBackend()
     try :
-        if not backend.isalpha() :
-            # don't trust user input
-            raise ImportError
         exec "from pykota.loggers import %s as loggingbackend" % backend.lower()    
     except ImportError :

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.62  2003/11/25 22:37:22  jalet
+# Small code move
+#
 # Revision 1.61  2003/11/25 22:03:28  jalet
 # No more message on stderr when the translation is not available.
@@ -251 +254 @@
 from mx import DateTime
 
-from pykota import version, config, storage, logger
-from pykota.accounter import openAccounter
+from pykota import version, config, storage, logger, accounter
 
 class PyKotaToolError(Exception):
@@ -278 +280 @@
         self.documentation = doc
         self.config = config.PyKotaConfig("/etc/pykota")
-        self.logger = logger.openLogger(self)
+        self.logger = logger.openLogger(self, self.config.getLoggingBackend())
         self.debug = self.config.getDebug()
         self.storage = storage.openConnection(self)
@@ -639 +641 @@
         self.username = self.username or 'root' 
         self.preserveinputfile = self.inputfile 
-        self.accounter = openAccounter(self)
+        self.accounter = accounter.openAccounter(self)
     
     def extractInfoFromCupsOrLprng(self) :