Changeset 3349 for pykota/trunk

Timestamp:

02/28/08 23:39:38 (16 years ago)

Author:

jerome

Message:

Fixed encoding problem with LDAP attribute's names extracted from
pykota.conf : they were unicode strings instead of being UTF-8 (or
even maybe ASCII, but we will use UTF-8).

Files:

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

pykota/trunk/pykota/config.py

@@ -23 +23 @@
 """This module defines classes used to parse PyKota configuration files."""
 
+import sys
 import os
 import tempfile
 import ConfigParser
 
+from pykota.utils import unicodeToDatabase
 from pykota.errors import PyKotaConfigError    
 
@@ -97 +99 @@
         backendinfo["storagebackend"] = backend
         if backend == "sqlitestorage" :
-            issqlite = 1
+            issqlite = True
             backendinfo["storagename"] = self.getGlobalOption("storagename")
             for option in ["storageserver", "storageuser", "storageuserpw"] :
                 backendinfo[option] = None          
         else :
-            issqlite = 0
+            issqlite = False
             for option in ["storageserver", "storagename", "storageuser"] :
                 backendinfo[option] = self.getGlobalOption(option)
@@ -151 +153 @@
                         "usermail", \
                       ] :
-            ldapinfo[option] = self.getGlobalOption(option).strip()
+            ldapinfo[option] = unicodeToDatabase(self.getGlobalOption(option).strip())
         for field in ["newuser", "newgroup"] :
             if ldapinfo[field].lower().startswith('attach(') :
@@ -160 +162 @@
         ldapinfo["cacert"] = self.getGlobalOption("cacert", ignore=True)
         if ldapinfo["cacert"] :
-            ldapinfo["cacert"] = ldapinfo["cacert"].strip()
+            ldapinfo["cacert"] = ldapinfo["cacert"].strip().encode(sys.getfilesystemencoding(), "replace")
         if ldapinfo["ldaptls"] :    
             if not os.access(ldapinfo["cacert"] or "", os.R_OK) :
-                raise PyKotaConfigError, _("Option ldaptls is set, but certificate %s is not readable.") % str(ldapinfo["cacert"])
+                raise PyKotaConfigError, _("Option ldaptls is set, but certificate %s is not readable.") % repr(ldapinfo["cacert"])
         return ldapinfo