From a489cf039174374ad79bfa0fc86d1404cd216796 Mon Sep 17 00:00:00 2001
From: Marian Sigler <m@qjym.de>
Date: Fri, 21 Sep 2012 02:53:01 +0200
Subject: AccountService.delete: check for basestring not .dn

---
 account.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'account.py')

diff --git a/account.py b/account.py
index c4fd225..13ab60c 100644
--- a/account.py
+++ b/account.py
@@ -147,15 +147,16 @@ class AccountService:
         if as_admin:
             self._bind_as_admin()
         else:
-            try: dn_user = account.dn
-            except: dn_user = 'uid=%s,ou=users,%s' % (account, self.base_dn)
-            user = dn_user
+            if isinstance(account, basestring):
+                user = 'uid=%s,ou=users,%s' % (account, self.base_dn)
+            else:
+                user = account.dn
 
             password = account.password
             self._bind('%s,%s' % (user, self.base_dn), password)
 
         dn = ['uid=%s,cn=%s,ou=services,%s' % (account.uid,s,self.base_dn) for s in account.services]
-        dn.append(dn_user)
+        dn.append(user)
 
         for x in dn:
             self.connection.delete_s(x)
-- 
cgit v1.2.3-1-g7c22