From f1d30bce9b48cd01f8421afe72a220662ce5f8ed Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 17 Jul 2018 10:54:53 +0200 Subject: [PATCH] Switch to python-ldap again pyldap is meanwhile an outdated and deprecated fork, and the Python 3.x compatibility fixes have been merged back to python-ldap. Change-Id: I4b793a9a72b84005a57cc1e3f6f89a483d7eda5c --- README.rst | 13 +++---------- lower-constraints.txt | 2 +- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 1fe75b5..f0fbad0 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ ldappool ======== -A simple connector pool for pyldap. +A simple connector pool for python-ldap. The pool keeps LDAP connectors alive and let you reuse them, drastically reducing the time spent to initiate a ldap connection. @@ -13,7 +13,7 @@ The pool has useful features like: - configurable max lifetime for connectors - a context manager to simplify acquiring and releasing a connector -**You need pyldap in order to use this library** +**You need python-ldap in order to use this library** Quickstart :::::::::: @@ -30,7 +30,7 @@ context manager with the *connection* method:: The connector returned by *connection* is a LDAPObject, that's binded to the -server. See https://github.com/pyldap/pyldap/ for details on how to use a connector. +server. See https://pypi.org/project/python-ldap/ for details on how to use a connector. ConnectionManager options @@ -58,10 +58,3 @@ The **connection** method takes two options: **default: None** - **passwd**: password used to connect. If None, uses the pool default's. **default: None** - - -History -::::::: - -Prior to v2.0.0 ``ldappool`` required ``python-ldap``. As of v2.0.0 this -library now required ``pyldap``, a python 3 compatible fork of ``python-ldap``. diff --git a/lower-constraints.txt b/lower-constraints.txt index 8e56cc3..337fd29 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -19,7 +19,7 @@ pep257==0.7.0 pep8==1.5.7 pyflakes==0.8.1 Pygments==2.2.0 -pyldap==2.4.20 +python-ldap==3.0.0 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 diff --git a/requirements.txt b/requirements.txt index 4fcd789..d12620f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pyldap>=2.4.20 # PSF +python-ldap>=3.0.0 # PSF