Stop catching ImportError for pyasn1

jdufresne · jdufresne · commit e5492c7490a5 · 2018-03-30T06:18:33.000-07:00
pyasn1 and pyasn1_modules are hard dependencies of python-ldap. They have been listed in install_requires since commit 5d15857. As they are not optional, can expect imports to succeed.
diff --git a/Lib/ldap/controls/__init__.py b/Lib/ldap/controls/__init__.py
@@ -17,10 +17,7 @@
 
 import ldap
 
-try:
-  from pyasn1.error import PyAsn1Error
-except ImportError:
-  PyAsn1Error = None
+from pyasn1.error import PyAsn1Error
 
 
 __all__ = [
diff --git a/Lib/ldap/extop/__init__.py b/Lib/ldap/extop/__init__.py
@@ -63,10 +63,5 @@ def decodeResponseValue(self,value):
     return value
 
 
-# Optionally import sub-modules which need pyasn1 et al
-try:
-  import pyasn1,pyasn1_modules.rfc2251
-except ImportError:
-  pass
-else:
-  from ldap.extop.dds import *
+# Import sub-modules
+from ldap.extop.dds import *
