Mark pyldap as optional

Close CZ-NIC#457

CHANGELOG.md

@@ -13,6 +13,8 @@ The format is based on the [KeepAChangeLog] project.
 
 ### Changed
 - [#134] ``l_registration_enpoint`` has been deprecated, use ``create_registration`` instead
+- [#457] pyldap is now an optional dependency. ``oic.utils.authn.ldapc`` and ``oic.utils.userinfo.ldap_info`` raise
+         ``ImportError`` on import if ``pyldap`` is not present
 
 ### Fixed
 - [#430] Audience of a client assertion is endpoint dependent.
@@ -31,6 +33,7 @@ The format is based on the [KeepAChangeLog] project.
 [#446]: https://github.com/OpenIDC/pyoidc/issues/446
 [#449]: https://github.com/OpenIDC/pyoidc/issues/449
 [#134]: https://github.com/OpenIDC/pyoidc/issues/134
+[#457]: https://github.com/OpenIDC/pyoidc/issues/457
 
 ## 0.12.0 [2017-09-25]
 

Pipfile

@@ -23,7 +23,6 @@ cryptography = "*"
 future = "*"
 pyOpenSSL = "*"
 pyjwkest = "*"
-pyldap = "*"
 requests = "*"
 Beaker = "*"
 Mako = "*"

setup.py

@@ -75,6 +75,7 @@ def run_tests(self):
         'testing': tests_requires,
         'docs': ['Sphinx', 'sphinx-autobuild'],
         'quality': ['pylama', 'isort'],
+        'ldap_authn': ['pyldap'],
     },
     install_requires=[
         "requests",

src/oic/utils/authn/ldapc.py

@@ -1,4 +1,7 @@
-import ldap
+try:
+    import ldap
+except ImportError:
+    raise ImportError('This module can be used only with pyldap installed.')
 
 from oic.exception import PyoidcError
 from oic.utils.authn.user import UsernamePasswordMako

src/oic/utils/userinfo/ldap_info.py

@@ -1,6 +1,9 @@
-import logging
+try:
+    import ldap
+except ImportError:
+    raise ImportError('This module can be used only with pyldap installed.')
 
-import ldap
+import logging
 
 from oic.utils.sanitize import sanitize
 from oic.utils.userinfo import UserInfo