Explicitly list limit exception types

ECN · Oct 24, 2015 · 5d85c44 · 5d85c44
1 parent b8844cb
commit 5d85c44
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Demo/pyasn1/noopsearch.py b/Demo/pyasn1/noopsearch.py
@@ -14,8 +14,6 @@
 
 from ldap.controls.openldap import SearchNoOpControl
 
-LDAPLimitErrors = (ldap.TIMEOUT,ldap.TIMELIMIT_EXCEEDED,ldap.SIZELIMIT_EXCEEDED,ldap.ADMINLIMIT_EXCEEDED)
-
 SEARCH_TIMEOUT=30.0
 
 try:
@@ -56,7 +54,11 @@
     serverctrls=[SearchNoOpControl(criticality=True)],
   )
   _,_,_,search_response_ctrls = ldap_conn.result3(msg_id,all=1,timeout=SEARCH_TIMEOUT)
-except LDAPLimitErrors,e:
+except (
+  ldap.TIMEOUT,
+  ldap.TIMELIMIT_EXCEEDED,
+  ldap.SIZELIMIT_EXCEEDED,
+  ldap.ADMINLIMIT_EXCEEDED),e:
   ldap_conn.abandon(msg_id)
   sys.exit(1)
 

diff --git a/Lib/ldap/controls/openldap.py b/Lib/ldap/controls/openldap.py
@@ -4,7 +4,7 @@
 
 See http://www.python-ldap.org/ for project details.
 
-$Id: openldap.py,v 1.4 2015/09/18 17:24:39 stroeder Exp $
+$Id: openldap.py,v 1.5 2015/10/24 16:21:14 stroeder Exp $
 """
 
 import ldap.controls
@@ -63,7 +63,12 @@ def noop_search_st(self,base,scope=ldap.SCOPE_SUBTREE,filterstr='(objectClass=*)
         serverctrls=[SearchNoOpControl(criticality=True)],
       )
       _,_,_,search_response_ctrls = self.result3(msg_id,all=1,timeout=timeout)
-    except LDAPLimitErrors,e:
+    except (
+      ldap.TIMEOUT,
+      ldap.TIMELIMIT_EXCEEDED,
+      ldap.SIZELIMIT_EXCEEDED,
+      ldap.ADMINLIMIT_EXCEEDED
+    ),e:
       self.abandon(msg_id)
       raise e
     else: