Changeset 1219

Timestamp:

11/26/03 00:46:40 (20 years ago)

Author:

jalet

Message:

Don't try to verify if module name is valid, Python does this better than us.

Location:

pykota/trunk/pykota

Files:

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

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2003/11/25 23:46:40  jalet
+# Don't try to verify if module name is valid, Python does this better than us.
+#
 # Revision 1.6  2003/11/12 23:28:55  jalet
 # More work on new backend. This commit may be unstable.
@@ -94 +97 @@
     (backend, args) = kotafilter.config.getAccounterBackend(kotafilter.printername)
     try :
-        if not backend.isalpha() :
-            # don't trust user input
-            raise ImportError
-        exec "from pykota.accounters import %s as accounterbackend" % backend.lower()    
+        exec "from pykota.accounters import %s as accounterbackend" % backend.lower()
     except ImportError :
         raise PyKotaAccounterError, _("Unsupported accounter backend %s") % backend

pykota/trunk/pykota/reporter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.3  2003/11/25 23:46:40  jalet
+# Don't try to verify if module name is valid, Python does this better than us.
+#
 # Revision 1.2  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -52 +55 @@
     """Returns a reporter instance of the proper reporter."""
     try :
-        exec "from pykota.reporters import %s as reporterbackend" % reporttype.lower()    
+        exec "from pykota.reporters import %s as reporterbackend" % reporttype.lower()
     except ImportError :
         raise PyKotaReporterError, _("Unsupported reporter backend %s") % reporttype

pykota/trunk/pykota/requester.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.10  2003/11/25 23:46:40  jalet
+# Don't try to verify if module name is valid, Python does this better than us.
+#
 # Revision 1.9  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -68 +71 @@
     (backend, args) = config.getRequesterBackend(printername)
     try :
-        if not backend.isalpha() :
-            # don't trust user input
-            raise ImportError
-        exec "from pykota.requesters import %s as requesterbackend" % backend.lower()    
+        exec "from pykota.requesters import %s as requesterbackend" % backend.lower()
     except ImportError :
         raise PyKotaRequesterError, _("Unsupported requester backend %s") % backend

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.28  2003/11/25 23:46:40  jalet
+# Don't try to verify if module name is valid, Python does this better than us.
+#
 # Revision 1.27  2003/11/23 19:01:36  jalet
 # Job price added to history
@@ -443 +446 @@
     backend = backendinfo["storagebackend"]
     try :
-        if not backend.isalpha() :
-            # don't trust user input
-            raise ImportError
-        #    
-        # TODO : descending compatibility
-        # 
-        if backend == "postgresql" :
-            backend = "pgstorage"       # TODO : delete, this is for descending compatibility only
-        exec "from pykota.storages import %s as storagebackend" % backend.lower()    
+        exec "from pykota.storages import %s as storagebackend" % backend.lower()
     except ImportError :
         raise PyKotaStorageError, _("Unsupported quota storage backend %s") % backend