diff --git a/fakeldap.py b/fakeldap.py index 12e8233..1d5ac68 100644 --- a/fakeldap.py +++ b/fakeldap.py @@ -29,7 +29,15 @@ import logging import types from collections import defaultdict -import ldap + +try: + import ldap +except ImportError: + class ldap(object): + class LDAPError(Exception): pass + class INVALID_CREDENTIALS(LDAPError): pass + class NO_SUCH_OBJECT(LDAPError): pass + class ALREADY_EXISTS(LDAPError): pass logger = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index 1d5270c..cb72824 100644 --- a/setup.py +++ b/setup.py @@ -8,8 +8,7 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() extra = {} -requirements = ['pyldap'], -tests_require = ['nose', 'Mock', 'coverage', 'unittest2', 'pyldap'] +tests_require = ['nose', 'Mock', 'coverage', 'unittest2', 'python-ldap'] setup( name = "fakeldap", @@ -17,7 +16,6 @@ def read(fname): #packages = find_packages('fakeldap'), #include_package_data=True, py_modules = ['fakeldap'], - install_requires = requirements, tests_require=tests_require, setup_requires='nose', diff --git a/tests.py b/tests.py index 551835d..52b49b7 100644 --- a/tests.py +++ b/tests.py @@ -1,6 +1,5 @@ from nose.tools import * -from fakeldap import MockLDAP -import ldap +from fakeldap import MockLDAP, ldap import unittest