Changeset 2945

Timestamp:

06/16/06 16:25:49 (18 years ago)

Author:

jerome

Message:

Replaced the 'exec' statements with the use of the standard 'imp' module.

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (2 diffs)
• logger.py (modified) (2 diffs)
• reporter.py (modified) (2 diffs)
• storage.py (modified) (2 diffs)

pykota/trunk/pykota/accounter.py

@@ -24 +24 @@
 
 import sys
+import os
+import imp
 
 class PyKotaAccounterError(Exception):
@@ -96 +98 @@
         (backend, args) = kotafilter.config.getAccounterBackend(kotafilter.PrinterName)
     try :
-        exec "from pykota.accounters import %s as accounterbackend" % backend.lower()
+        accounterbackend = imp.load_source("accounterbackend", 
+                                            os.path.join(os.path.dirname(__file__),
+                                                         "storages",
+                                                         "%s.py" % backend.lower()))
     except ImportError :
         raise PyKotaAccounterError, _("Unsupported accounter backend %s") % backend

pykota/trunk/pykota/logger.py

@@ -23 +23 @@
 #
 
+import os
+import imp
+
 class PyKotaLoggingError(Exception):
     """An exception for logging related stuff."""
@@ -35 +38 @@
     """Returns the appropriate logger subsystem object."""
     try :
-        exec "from pykota.loggers import %s as loggingbackend" % backend.lower()    
+        loggingbackend = imp.load_source("loggingbackend", 
+                                         os.path.join(os.path.dirname(__file__),
+                                                      "loggers",
+                                                      "%s.py" % backend.lower()))
     except ImportError :
         raise PyKotaLoggingError, _("Unsupported logging subsystem %s") % backend

pykota/trunk/pykota/reporter.py

@@ -23 +23 @@
 #
 
+import os
+import imp
 from mx import DateTime
 
@@ -142 +144 @@
     """Returns a reporter instance of the proper reporter."""
     try :
-        exec "from pykota.reporters import %s as reporterbackend" % reporttype.lower()
+        reporterbackend = imp.load_source("reporterbackend", 
+                                           os.path.join(os.path.dirname(__file__),
+                                                        "reporters",
+                                                        "%s.py" % reporttype.lower()))
     except ImportError :
         raise PyKotaReporterError, _("Unsupported reporter backend %s") % reporttype

pykota/trunk/pykota/storage.py

@@ -23 +23 @@
 #
 
+import os
+import imp
 from mx import DateTime
 
@@ -750 +752 @@
     backend = backendinfo["storagebackend"]
     try :
-        exec "from pykota.storages import %s as storagebackend" % backend.lower()
+        storagebackend = imp.load_source("storagebackend", 
+                                         os.path.join(os.path.dirname(__file__),
+                                                      "storages",
+                                                      "%s.py" % backend.lower()))
     except ImportError :
         raise PyKotaStorageError, _("Unsupported quota storage backend %s") % backend