From 0e1da6275ba0ff5fcaa7cf054e87aa4d1eae83a9 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Thu, 18 Apr 2013 16:59:32 -0500 Subject: [PATCH] #4: UTF-8 encode passwd only when set --- ldappool/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ldappool/__init__.py b/ldappool/__init__.py index 4d5319e..6299177 100644 --- a/ldappool/__init__.py +++ b/ldappool/__init__.py @@ -139,7 +139,8 @@ class ConnectionManager(object): return len(self._pool) def _match(self, bind, passwd): - passwd = passwd.encode('utf8') + if passwd is not None: + passwd = passwd.encode('utf8') with self._pool_lock: inactives = [] @@ -200,7 +201,8 @@ class ConnectionManager(object): """ tries = 0 connected = False - passwd = passwd.encode('utf8') + if passwd is not None: + passwd = passwd.encode('utf8') exc = None # trying retry_max times in a row with a fresh connector