Changeset 800 for pykota/trunk/pykota/config.py

Timestamp:

02/17/03 23:06:07 (21 years ago)

Author:

jalet

Message:

Storage backend now supports admin and user passwords (untested)

Files:

• pykota/trunk/pykota/config.py (modified) (3 diffs)

pykota/trunk/pykota/config.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.14  2003/02/17 22:05:50  jalet
+# Storage backend now supports admin and user passwords (untested)
+#
 # Revision 1.13  2003/02/10 11:47:39  jalet
 # Moved some code down into the requesters
@@ -90 +93 @@
         for option in [ "storagebackend", "storageserver", \
                         "storagename", "storageadmin", \
-                        "storageuser", # TODO : "storageadminpw", "storageusepw", \
+                        "storageuser", 
                         "logger", "admin", "adminmail",
                         "smtpserver", "method", "gracedelay" ] :
@@ -130 +133 @@
         
     def getStorageBackend(self) :    
-        """Returns the storage backend information as a tuple.
-        
-           The tuple has the form :
-           
-             (backend, host, database, admin, user)
-        """        
-        backendinfo = []
+        """Returns the storage backend information as a Python mapping."""        
+        backendinfo = {}
         for option in [ "storagebackend", "storageserver", \
                         "storagename", "storageadmin", \
-                        "storageuser", # TODO : "storageadminpw", "storageusepw", \
+                        "storageuser", \
                       ] :
-            backendinfo.append(self.config.get("global", option, raw=1))
-        return tuple(backendinfo)    
+            backendinfo[option] = self.config.get("global", option, raw=1)
+        for option in [ "storageadminpw", "storageuserpw" ] :    
+            if self.config.has_option("global", option) :
+                backendinfo[option] = self.config.get("global", option, raw=1)
+            else :    
+                backendinfo[option] = None
+        return backendinfo
         
     def getLoggingBackend(self) :