[Checkins] SVN: ldapadapter/trunk/src/ldapadapter/utility.py
Generalized some UTF-8 encoding stuff
Torsten Kurbad
t.kurbad at iwm-kmrc.de
Mon Feb 4 09:12:28 EST 2008
Log message for revision 83497:
Generalized some UTF-8 encoding stuff
Changed:
U ldapadapter/trunk/src/ldapadapter/utility.py
-=-
Modified: ldapadapter/trunk/src/ldapadapter/utility.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/utility.py 2008-02-04 13:42:18 UTC (rev 83496)
+++ ldapadapter/trunk/src/ldapadapter/utility.py 2008-02-04 14:12:27 UTC (rev 83497)
@@ -63,7 +63,7 @@
dn = self.bindDN or ''
password = self.bindPassword or ''
try:
- conn.simple_bind_s(dn.encode('utf-8'), password)
+ conn.simple_bind_s(dn, password)
except ldap.SERVER_DOWN:
raise interfaces.ServerDown
except ldap.INVALID_CREDENTIALS:
@@ -152,7 +152,7 @@
# FIXME: there may be non-textual binary values.
try:
values[:] = [unicode(v, 'utf-8') for v in values]
- except UnicodeDecodeError:
+ except (UnicodeDecodeError, TypeError):
# Not all data is unicode, so decoding does not always work.
pass
results.append((dn, entry))
More information about the Checkins
mailing list