ldappool 2.4.1__tar.gz → 3.1.0__tar.gz

ldappool-3.1.0/.zuul.yaml

@@ -0,0 +1,7 @@
+---
+- project:
+    templates:
+      - check-requirements
+      - openstack-python3-jobs
+      - openstack-python3-next-jobs
+      - release-notes-jobs-python3

{ldappool-2.4.1 → ldappool-3.1.0}/AUTHORS

@@ -9,21 +9,32 @@ Colleen Murphy <comurphy@suse.com>
 Corey Bryant <corey.bryant@canonical.com>
 Dirk Mueller <dirk@dmllr.de>
 Doug Hellmann <doug@doughellmann.com>
+Ghanshyam Mann <gmann@ghanshyammann.com>
+Hervé Beraud <hberaud@redhat.com>
+Jimmy McCrory <jimmy.mccrory@gmail.com>
+LiZekun <2954674728@qq.com>
 Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
 Monty Taylor <mordred@inaugust.com>
 Morgan Fainberg <morgan.fainberg@gmail.com>
 Nathan Kinder <nkinder@redhat.com>
 Nick Wilburn <senior.crepe@gmail.com>
 Samriddhi Jain <j.samriddhi13@gmail.com>
+Stephen Finucane <stephenfin@redhat.com>
 Steve Martinelli <s.martinelli@gmail.com>
+Sven Kieske <kieske@osism.tech>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
+Takashi Kajinami <tkajinam@redhat.com>
 Tarek Ziade <tarek@ziade.org>
 Tarek Ziade <ziade.tarek@gmail.com>
 Tarek Ziadé <tarek@mozilla.com>
 Tony Breeds <tony@bakeyournoodle.com>
 Van Hung Pham <hungpv@vn.fujitsu.com>
 Vieri <15050873171@163.com>
+Vishakha Agarwal <agarwalvishakha18@gmail.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>
+Wander Way <wanderwayout@gmail.com>
 huang.zhiping <huang.zhiping@99cloud.net>
+jacky06 <zhang.min@99cloud.net>
 pallavi <pallavi.s@nectechnologies.in>
 qingszhao <zhao.daqing@99cloud.net>
 ricolin <rico.lin@easystack.cn>

{ldappool-2.4.1 → ldappool-3.1.0}/ChangeLog

@@ -1,6 +1,48 @@
 CHANGES
 =======
 
+3.1.0
+-----
+
+* Declare Python 3.15 support
+* Simplify tox.ini
+* Remove Python 3.10 support
+* Migrate setup configuration to pyproject.toml
+* Remove MANIFEST.in
+* Drop flake8-docstrings
+* add pyproject.toml to support pip 23.1
+* Add note about requirements lower bounds
+* Remove Python 3.8 support
+* Retry or failover when using TLS
+* Remove old excludes
+* Bump hacking
+* Update python classifier in setup.cfg
+* Remove deprecated pbr options
+* fix small typo in BackendError class
+* Remove usage of six library
+* Fix pep8 gate
+* setup.cfg: Replace dashes by underscores
+* Use TOX\_CONSTRAINTS\_FILE
+* Update python testing as per zed cycle testing runtime
+* Update CI to use unversioned jobs template
+
+3.0.0
+-----
+
+* Remove lower-constraints, uncap PrettyTable
+* Stop to use the \_\_future\_\_ module
+* Switch to newer openstackdocstheme and reno versions
+* Cleanup py27 support
+* Update hacking for Python3
+* [ussuri][goal] Drop python 2.7 support and testing
+* Follow the PTI for docs
+* Add Python 3 Train unit tests
+* Add bindep.txt
+* Sync Sphinx requirement
+* OpenDev Migration Patch
+* Update the min version of tox
+* Drop py35 jobs
+
 2.4.1
 -----
 

ldappool-3.1.0/PKG-INFO

@@ -0,0 +1,107 @@
+Metadata-Version: 2.4
+Name: ldappool
+Version: 3.1.0
+Summary: A simple connector pool for python-ldap.
+Author-email: OpenStack <openstack-discuss@lists.openstack.org>
+License-Expression: MPL-2.0
+Project-URL: Homepage, https://opendev.org/openstack/ldappool
+Project-URL: Repository, https://opendev.org/openstack/ldappool
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: python-ldap>=3.0.0
+Requires-Dist: PrettyTable>=0.7.2
+Dynamic: requires-dist
+
+ldappool
+========
+
+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.
+
+The pool has useful features like:
+
+- transparent reconnection on failures or server restarts
+- configurable pool size and connectors timeouts
+- configurable max lifetime for connectors
+- a context manager to simplify acquiring and releasing a connector
+
+**You need python-ldap in order to use this library**
+
+Quickstart
+::::::::::
+
+To work with the pool, you just need to create it, then use it as a
+context manager with the *connection* method::
+
+    from ldappool import ConnectionManager
+
+    cm = ConnectionManager('ldap://localhost')
+
+    with cm.connection('uid=adminuser,ou=logins,dc=mozilla', 'password') as conn:
+        .. do something with conn ..
+
+
+The connector returned by *connection* is a LDAPObject, that's binded to the
+server. See https://pypi.org/project/python-ldap/ for details on how to use a connector.
+
+It is possible to check the state of the pool by representing the pool as a string::
+
+    from ldappool import ConnectionManager
+
+    cm = ConnectionManager('ldap://localhost', size=2)
+
+    .. do something with cm ..
+
+    print(cm)
+
+This will result in output similar to this table::
+
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+    | Slot (2 max) | Connected |  Active  |       URI        | Lifetime (600 max) |           Bind DN            |
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+    |      1       | connected | inactive | ldap://localhost |  0.00496101379395  | uid=tuser,dc=example,dc=test |
+    |      2       | connected | inactive | ldap://localhost |  0.00532603263855  | uid=tuser,dc=example,dc=test |
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+
+
+ConnectionManager options
+:::::::::::::::::::::::::
+
+Here are the options you can use when instanciating the pool:
+
+- **uri**: ldap server uri **[mandatory]**
+- **bind**: default bind that will be used to bind a connector.
+  **default: None**
+- **passwd**: default password that will be used to bind a connector.
+  **default: None**
+- **size**: pool size. **default: 10**
+- **retry_max**: number of attempts when a server is down. **default: 3**
+- **retry_delay**: delay in seconds before a retry. **default: .1**
+- **use_tls**: activate TLS when connecting. **default: False**
+- **timeout**: connector timeout. **default: -1**
+- **use_pool**: activates the pool. If False, will recreate a connector
+  each time. **default: True**
+
+The **uri** option will accept a comma or whitespace separated list of LDAP
+server URIs to allow for failover behavior when connection errors are
+encountered.  Connections will be attempted against the servers in order,
+with **retry_max** attempts per URI before failing over to the next server.
+
+The **connection** method takes two options:
+
+- **bind**: bind used to connect. If None, uses the pool default's.
+  **default: None**
+- **passwd**: password used to connect. If None, uses the pool default's.
+  **default: None**

ldappool-3.1.0/bindep.txt

@@ -0,0 +1,10 @@
+# See openstack-infra/project-config:jenkins/data/bindep-fallback.txt
+# This is used by bindep: sudo [apt-get | yum] install $(bindep -b)
+
+libldap2-dev [platform:dpkg]
+libsasl2-dev [platform:dpkg]
+
+cyrus-sasl-devel [platform:rpm]
+openldap-devel [platform:redhat]
+
+openldap2-devel [platform:suse]

ldappool-3.1.0/doc/requirements.txt

@@ -0,0 +1,3 @@
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0 # BSD

{ldappool-2.4.1 → ldappool-3.1.0}/doc/source/conf.py

@@ -12,12 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import unicode_literals
-
 import os
-import subprocess
 import sys
-import warnings
 
 import pbr.version
 
@@ -60,15 +56,6 @@ master_doc = 'index'
 project = 'ldappool'
 copyright = 'OpenStack Contributors'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-version_info = pbr.version.VersionInfo('ldappool')
-# The short X.Y version.
-version = version_info.version_string()
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
@@ -102,7 +89,7 @@ add_module_names = True
 #show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['ldappool.']
@@ -148,10 +135,6 @@ html_theme = 'openstackdocs'
 # so a file named "default.css" will overwrite the builtin "default.css".
 #html_static_path = ['static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
@@ -226,6 +209,6 @@ intersphinx_mapping = {
 }
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/ldappool'
-bug_project = 'ldappool'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/ldappool'
+openstackdocs_bug_project = 'ldappool'
+openstackdocs_bug_tag = ''

{ldappool-2.4.1 → ldappool-3.1.0}/doc/source/index.rst

@@ -1,23 +1,25 @@
 ldappool
 ========
 
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 1
 
+.. only:: html
+
    api/modules
 
 Release Notes
-=============
+--------------
 
-.. toctree::
-   :maxdepth: 1
+`Release Notes`_
 
-   history
+.. _Release Notes: https://docs.openstack.org/releasenotes/ldappool/
 
 Contributing
-============
+------------
 
 Code is hosted `on GitHub`_. Submit bugs to the Keystone project on
 `Launchpad`_. Submit code to the ``openstack/ldappool`` project
@@ -30,7 +32,7 @@ using `Gerrit`_.
 Run tests with ``tox``.
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`

{ldappool-2.4.1 → ldappool-3.1.0}/ldappool/__init__.py

@@ -35,7 +35,6 @@
 # ***** END LICENSE BLOCK *****
 """ LDAP Connection Pool.
 """
-import codecs
 from contextlib import contextmanager
 import logging
 from threading import RLock
@@ -45,29 +44,26 @@ import ldap
 from ldap.ldapobject import ReconnectLDAPObject
 from prettytable import PrettyTable
 import re
-import six
-from six import PY2
 
 log = logging.getLogger(__name__)
-_utf8_encoder = codecs.getencoder('utf-8')
 
 
 def utf8_encode(value):
     """Encode a basestring to UTF-8.
 
-    If the string is unicode encode it to UTF-8, if the string is
-    str then assume it's already encoded. Otherwise raise a TypeError.
+    If the value is string, encode it to UTF-8, if the value is
+    bytes then assume it's already encoded. Otherwise raise a TypeError.
 
     :param value: A basestring
     :returns: UTF-8 encoded version of value
     :raises TypeError: If value is not basestring
     """
-    if isinstance(value, six.text_type):
-        return _utf8_encoder(value)[0]
-    elif isinstance(value, six.binary_type):
+    if isinstance(value, str):
+        return value.encode('utf-8')
+    elif isinstance(value, bytes):
         return value
     else:
-        raise TypeError("bytes or Unicode expected, got %s"
+        raise TypeError("bytes or str expected, got %s"
                         % type(value).__name__)
 
 
@@ -77,7 +73,7 @@ class MaxConnectionReachedError(Exception):
 
 class BackendError(Exception):
     def __init__(self, msg, backend):
-        self.bacend = backend
+        self.backend = backend
         Exception.__init__(self, msg)
 
 
@@ -169,9 +165,6 @@ class ConnectionManager(object):
         return len(self._pool)
 
     def _match(self, bind, passwd):
-        if passwd is not None:
-            if PY2:
-                passwd = utf8_encode(passwd)
         with self._pool_lock:
             inactives = []
 
@@ -219,12 +212,7 @@ class ConnectionManager(object):
     def _bind(self, conn, bind, passwd):
         # let's bind
         if self.use_tls:
-            try:
-                conn.start_tls_s()
-            except Exception:
-                raise BackendError('Could not activate TLS on established '
-                                   'connection with %s' % self.uri,
-                                   backend=conn)
+            conn.start_tls_s()
 
         if bind is not None:
             conn.simple_bind_s(bind, passwd)
@@ -242,15 +230,12 @@ class ConnectionManager(object):
         :raises BackendError: If unable to connect to LDAP
         """
         connected = False
-        if passwd is not None:
-            if PY2:
-                passwd = utf8_encode(passwd)
 
         # If multiple server URIs have been provided, loop through
         # each one in turn in case of connection failures (server down,
         # timeout, etc.).  URIs can be delimited by either commas or
         # whitespace.
-        for server in re.split('[\s,]+', self.uri):
+        for server in re.split(r'[\s,]+', self.uri):
             tries = 0
             exc = None
             conn = None

{ldappool-2.4.1 → ldappool-3.1.0}/ldappool/tests/test_ldapconnection.py

@@ -96,11 +96,25 @@ def _bind_fails_invalid_credentials_failover(self, who='', cred='', **kw):
         raise ldap.INVALID_CREDENTIALS('LDAP connection invalid')
 
 
+def _bind_fails_tls_failover(self, who='', cred='', **kw):
+    # Raise backend error unless the URI is 'ldap://GOOD'
+    if self._uri == 'ldap://GOOD':
+        self.connected = True
+        self.who = who
+        self.cred = cred
+        return 1
+    else:
+        raise ldappool.BackendError
+
+
 def _start_tls_s(self):
+    # Raise a server down error if the URI is 'ldap://BAD'
     if self.start_tls_already_called_flag:
         raise ldap.LOCAL_ERROR
     else:
         self.start_tls_already_called_flag = True
+    if self._uri == 'ldap://BAD':
+        raise ldap.SERVER_DOWN('LDAP connection invalid')
 
 
 class TestLDAPConnection(unittest.TestCase):
@@ -323,3 +337,29 @@ class TestLDAPConnection(unittest.TestCase):
             pass
         else:
             raise AssertionError()
+
+    def test_simple_bind_fails_tls_failover(self):
+        unbinds = []
+
+        def _unbind(self):
+            unbinds.append(1)
+
+        # the binding to any server other than 'ldap://GOOD' fails
+        # with ldap.SERVER_DOWN
+        ldappool.StateConnector.simple_bind_s = _bind_fails_tls_failover
+        ldappool.StateConnector.unbind_s = _unbind
+        uri = 'ldap://BAD,ldap://GOOD'
+        dn = 'uid=adminuser,ou=logins,dc=mozilla'
+        passwd = 'adminuser'
+        cm = ldappool.ConnectionManager(uri, dn, passwd, use_pool=True,
+                                        size=2, use_tls=True)
+        self.assertEqual(len(cm), 0)
+
+        try:
+            with cm.connection('dn', 'pass') as conn:
+                # Ensure we failed over to the second URI
+                self.assertTrue(conn.active)
+                self.assertEqual(conn._uri, 'ldap://GOOD')
+                pass
+        except Exception:
+            raise AssertionError()

ldappool-3.1.0/ldappool.egg-info/PKG-INFO

@@ -0,0 +1,107 @@
+Metadata-Version: 2.4
+Name: ldappool
+Version: 3.1.0
+Summary: A simple connector pool for python-ldap.
+Author-email: OpenStack <openstack-discuss@lists.openstack.org>
+License-Expression: MPL-2.0
+Project-URL: Homepage, https://opendev.org/openstack/ldappool
+Project-URL: Repository, https://opendev.org/openstack/ldappool
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: python-ldap>=3.0.0
+Requires-Dist: PrettyTable>=0.7.2
+Dynamic: requires-dist
+
+ldappool
+========
+
+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.
+
+The pool has useful features like:
+
+- transparent reconnection on failures or server restarts
+- configurable pool size and connectors timeouts
+- configurable max lifetime for connectors
+- a context manager to simplify acquiring and releasing a connector
+
+**You need python-ldap in order to use this library**
+
+Quickstart
+::::::::::
+
+To work with the pool, you just need to create it, then use it as a
+context manager with the *connection* method::
+
+    from ldappool import ConnectionManager
+
+    cm = ConnectionManager('ldap://localhost')
+
+    with cm.connection('uid=adminuser,ou=logins,dc=mozilla', 'password') as conn:
+        .. do something with conn ..
+
+
+The connector returned by *connection* is a LDAPObject, that's binded to the
+server. See https://pypi.org/project/python-ldap/ for details on how to use a connector.
+
+It is possible to check the state of the pool by representing the pool as a string::
+
+    from ldappool import ConnectionManager
+
+    cm = ConnectionManager('ldap://localhost', size=2)
+
+    .. do something with cm ..
+
+    print(cm)
+
+This will result in output similar to this table::
+
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+    | Slot (2 max) | Connected |  Active  |       URI        | Lifetime (600 max) |           Bind DN            |
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+    |      1       | connected | inactive | ldap://localhost |  0.00496101379395  | uid=tuser,dc=example,dc=test |
+    |      2       | connected | inactive | ldap://localhost |  0.00532603263855  | uid=tuser,dc=example,dc=test |
+    +--------------+-----------+----------+------------------+--------------------+------------------------------+
+
+
+ConnectionManager options
+:::::::::::::::::::::::::
+
+Here are the options you can use when instanciating the pool:
+
+- **uri**: ldap server uri **[mandatory]**
+- **bind**: default bind that will be used to bind a connector.
+  **default: None**
+- **passwd**: default password that will be used to bind a connector.
+  **default: None**
+- **size**: pool size. **default: 10**
+- **retry_max**: number of attempts when a server is down. **default: 3**
+- **retry_delay**: delay in seconds before a retry. **default: .1**
+- **use_tls**: activate TLS when connecting. **default: False**
+- **timeout**: connector timeout. **default: -1**
+- **use_pool**: activates the pool. If False, will recreate a connector
+  each time. **default: True**
+
+The **uri** option will accept a comma or whitespace separated list of LDAP
+server URIs to allow for failover behavior when connection errors are
+encountered.  Connections will be attempted against the servers in order,
+with **retry_max** attempts per URI before failing over to the next server.
+
+The **connection** method takes two options:
+
+- **bind**: bind used to connect. If None, uses the pool default's.
+  **default: None**
+- **passwd**: password used to connect. If None, uses the pool default's.
+  **default: None**

{ldappool-2.4.1 → ldappool-3.1.0}/ldappool.egg-info/SOURCES.txt

@@ -4,9 +4,9 @@ AUTHORS
 CHANGES.rst
 CONTRIBUTORS
 ChangeLog
-MANIFEST.in
 README.rst
-lower-constraints.txt
+bindep.txt
+pyproject.toml
 requirements.txt
 setup.cfg
 setup.py
@@ -15,7 +15,6 @@ tox.ini
 doc/Makefile
 doc/requirements.txt
 doc/source/conf.py
-doc/source/history.rst
 doc/source/index.rst
 ldappool/__init__.py
 ldappool.egg-info/PKG-INFO
@@ -28,6 +27,8 @@ ldappool.egg-info/top_level.txt
 ldappool/tests/__init__.py
 ldappool/tests/test_ldapconnection.py
 ldappool/tests/test_ldappool.py
+releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml
+releasenotes/notes/remove-py38-4a1a65ec118db41f.yaml
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/unreleased.rst

ldappool-3.1.0/ldappool.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "de45796", "is_release": true}

ldappool-3.1.0/ldappool.egg-info/requires.txt

@@ -0,0 +1,2 @@
+python-ldap>=3.0.0
+PrettyTable>=0.7.2

ldappool-3.1.0/pyproject.toml

@@ -0,0 +1,33 @@
+[build-system]
+requires = ["pbr>=6.1.1"]
+build-backend = "pbr.build"
+
+[project]
+name = "ldappool"
+description = "A simple connector pool for python-ldap."
+authors = [
+    {name = "OpenStack", email = "openstack-discuss@lists.openstack.org"},
+]
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = "MPL-2.0"
+dynamic = ["version", "dependencies"]
+requires-python = ">=3.11"
+classifiers = [
+  "Intended Audience :: Developers",
+  "Operating System :: POSIX :: Linux",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.15",
+]
+
+[project.urls]
+Homepage = "https://opendev.org/openstack/ldappool"
+Repository = "https://opendev.org/openstack/ldappool"
+
+[tool.setuptools.packages.find]
+include = ["ldappool*"]

ldappool-3.1.0/releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of ldappool
+    to support python 2.7 is OpenStack Train. The minimum version of Python now
+    supported is Python 3.6.

ldappool-3.1.0/releasenotes/notes/remove-py38-4a1a65ec118db41f.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Support for Python 3.8 has been removed. Now the minimum python version
+    supported is 3.9 .

{ldappool-2.4.1 → ldappool-3.1.0}/releasenotes/source/conf.py

@@ -97,7 +97,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -146,11 +146,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
@@ -278,6 +273,7 @@ texinfo_documents = [
 locale_dirs = ['locale/']
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/ldappool'
-bug_project = 'ldappool'
-bug_tag = 'doc'
+openstackdocs_repo_name = 'openstack/ldappool'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'ldappool'
+openstackdocs_bug_tag = 'doc'

ldappool-3.1.0/requirements.txt

@@ -0,0 +1,6 @@
+# Requirements lower bounds listed here are our best effort to keep them up to
+# date but we do not test them so no guarantee of having them all correct. If
+# you find any incorrect lower bounds, let us know or propose a fix.
+
+python-ldap>=3.0.0 # PSF
+PrettyTable>=0.7.2

ldappool-3.1.0/setup.cfg

@@ -0,0 +1,7 @@
+[metadata]
+name = ldappool
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{ldappool-2.4.1 → ldappool-3.1.0}/setup.py

@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)

ldappool-3.1.0/test-requirements.txt

@@ -0,0 +1,7 @@
+hacking>=6.1.0,<6.2.0 # Apache-2.0
+
+coverage>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
+testresources>=2.0.0 # Apache-2.0/BSD
+testtools>=2.2.0 # MIT

ldappool-3.1.0/tox.ini

@@ -0,0 +1,62 @@
+[tox]
+minversion = 4.28.0
+skipsdist = True
+envlist = pep8,cover,docs,releasenotes
+
+[testenv]
+usedevelop = True
+setenv =
+  OS_STDOUT_NOCAPTURE=False
+  OS_STDERR_NOCAPTURE=False
+  PYTHONDONTWRITEBYTECODE=1
+constraints =
+  {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+commands =
+  stestr run --slowest {posargs}
+
+[testenv:pep8]
+commands =
+  flake8
+
+[testenv:venv]
+commands = {posargs}
+
+[testenv:cover]
+setenv =
+  PYTHON=coverage run --source ldappool --parallel-mode
+commands =
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+
+[flake8]
+# D100: Missing docstring in public module
+# D101: Missing docstring in public class
+# D102: Missing docstring in public method
+# D103: Missing docstring in public function
+# D104: Missing docstring in public package
+# D105: Missing docstring in magic method
+# D107: Missing docstring in __init__
+# D200: One-line docstring should fit on one line with quotes
+# D210: No whitespaces allowed surrounding docstring text
+# D401: First line should be in imperative mood
+ignore = D100,D101,D102,D104,D105,D107,D200,D210,D401
+show-source = True
+exclude = .venv,.tox,dist,doc,*egg,build
+
+[testenv:docs]
+skip_install = true
+deps =
+  -r{toxinidir}/doc/requirements.txt
+commands=
+  sphinx-build -W -b html doc/source doc/build/html
+
+[testenv:releasenotes]
+skip_install = true
+deps = {[testenv:docs]deps}
+commands =
+  sphinx-build -W -b html releasenotes/source releasenotes/build/html

ldappool-2.4.1/.zuul.yaml

@@ -1,9 +0,0 @@
-- project:
-    templates:
-      - check-requirements
-      - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
-      - release-notes-jobs-python3

ldappool-2.4.1/MANIFEST.in

@@ -1,4 +0,0 @@
-include README.rst
-include MANIFEST.in
-include CHANGES.rst
-include CONTRIBUTORS

ldappool-2.4.1/PKG-INFO

@@ -1,102 +0,0 @@
-Metadata-Version: 1.1
-Name: ldappool
-Version: 2.4.1
-Summary: A simple connector pool for python-ldap.
-Home-page: https://git.openstack.org/cgit/openstack/ldappool
-Author: OpenStack
-Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
-Description: ldappool
-        ========
-        
-        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.
-        
-        The pool has useful features like:
-        
-        - transparent reconnection on failures or server restarts
-        - configurable pool size and connectors timeouts
-        - configurable max lifetime for connectors
-        - a context manager to simplify acquiring and releasing a connector
-        
-        **You need python-ldap in order to use this library**
-        
-        Quickstart
-        ::::::::::
-        
-        To work with the pool, you just need to create it, then use it as a
-        context manager with the *connection* method::
-        
-            from ldappool import ConnectionManager
-        
-            cm = ConnectionManager('ldap://localhost')
-        
-            with cm.connection('uid=adminuser,ou=logins,dc=mozilla', 'password') as conn:
-                .. do something with conn ..
-        
-        
-        The connector returned by *connection* is a LDAPObject, that's binded to the
-        server. See https://pypi.org/project/python-ldap/ for details on how to use a connector.
-        
-        It is possible to check the state of the pool by representing the pool as a string::
-        
-            from ldappool import ConnectionManager
-        
-            cm = ConnectionManager('ldap://localhost', size=2)
-        
-            .. do something with cm ..
-        
-            print(cm)
-        
-        This will result in output similar to this table::
-        
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-            | Slot (2 max) | Connected |  Active  |       URI        | Lifetime (600 max) |           Bind DN            |
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-            |      1       | connected | inactive | ldap://localhost |  0.00496101379395  | uid=tuser,dc=example,dc=test |
-            |      2       | connected | inactive | ldap://localhost |  0.00532603263855  | uid=tuser,dc=example,dc=test |
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-        
-        
-        ConnectionManager options
-        :::::::::::::::::::::::::
-        
-        Here are the options you can use when instanciating the pool:
-        
-        - **uri**: ldap server uri **[mandatory]**
-        - **bind**: default bind that will be used to bind a connector.
-          **default: None**
-        - **passwd**: default password that will be used to bind a connector.
-          **default: None**
-        - **size**: pool size. **default: 10**
-        - **retry_max**: number of attempts when a server is down. **default: 3**
-        - **retry_delay**: delay in seconds before a retry. **default: .1**
-        - **use_tls**: activate TLS when connecting. **default: False**
-        - **timeout**: connector timeout. **default: -1**
-        - **use_pool**: activates the pool. If False, will recreate a connector
-          each time. **default: True**
-        
-        The **uri** option will accept a comma or whitespace separated list of LDAP
-        server URIs to allow for failover behavior when connection errors are
-        encountered.  Connections will be attempted against the servers in order,
-        with **retry_max** attempts per URI before failing over to the next server.
-        
-        The **connection** method takes two options:
-        
-        - **bind**: bind used to connect. If None, uses the pool default's.
-          **default: None**
-        - **passwd**: password used to connect. If None, uses the pool default's.
-          **default: None**
-        
-        
-Platform: UNKNOWN
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5

ldappool-2.4.1/doc/requirements.txt

@@ -1,3 +0,0 @@
-openstackdocstheme>=1.18.1 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD

ldappool-2.4.1/doc/source/history.rst

@@ -1 +0,0 @@
-.. include:: ../../ChangeLog

ldappool-2.4.1/ldappool.egg-info/PKG-INFO

@@ -1,102 +0,0 @@
-Metadata-Version: 1.1
-Name: ldappool
-Version: 2.4.1
-Summary: A simple connector pool for python-ldap.
-Home-page: https://git.openstack.org/cgit/openstack/ldappool
-Author: OpenStack
-Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
-Description: ldappool
-        ========
-        
-        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.
-        
-        The pool has useful features like:
-        
-        - transparent reconnection on failures or server restarts
-        - configurable pool size and connectors timeouts
-        - configurable max lifetime for connectors
-        - a context manager to simplify acquiring and releasing a connector
-        
-        **You need python-ldap in order to use this library**
-        
-        Quickstart
-        ::::::::::
-        
-        To work with the pool, you just need to create it, then use it as a
-        context manager with the *connection* method::
-        
-            from ldappool import ConnectionManager
-        
-            cm = ConnectionManager('ldap://localhost')
-        
-            with cm.connection('uid=adminuser,ou=logins,dc=mozilla', 'password') as conn:
-                .. do something with conn ..
-        
-        
-        The connector returned by *connection* is a LDAPObject, that's binded to the
-        server. See https://pypi.org/project/python-ldap/ for details on how to use a connector.
-        
-        It is possible to check the state of the pool by representing the pool as a string::
-        
-            from ldappool import ConnectionManager
-        
-            cm = ConnectionManager('ldap://localhost', size=2)
-        
-            .. do something with cm ..
-        
-            print(cm)
-        
-        This will result in output similar to this table::
-        
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-            | Slot (2 max) | Connected |  Active  |       URI        | Lifetime (600 max) |           Bind DN            |
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-            |      1       | connected | inactive | ldap://localhost |  0.00496101379395  | uid=tuser,dc=example,dc=test |
-            |      2       | connected | inactive | ldap://localhost |  0.00532603263855  | uid=tuser,dc=example,dc=test |
-            +--------------+-----------+----------+------------------+--------------------+------------------------------+
-        
-        
-        ConnectionManager options
-        :::::::::::::::::::::::::
-        
-        Here are the options you can use when instanciating the pool:
-        
-        - **uri**: ldap server uri **[mandatory]**
-        - **bind**: default bind that will be used to bind a connector.
-          **default: None**
-        - **passwd**: default password that will be used to bind a connector.
-          **default: None**
-        - **size**: pool size. **default: 10**
-        - **retry_max**: number of attempts when a server is down. **default: 3**
-        - **retry_delay**: delay in seconds before a retry. **default: .1**
-        - **use_tls**: activate TLS when connecting. **default: False**
-        - **timeout**: connector timeout. **default: -1**
-        - **use_pool**: activates the pool. If False, will recreate a connector
-          each time. **default: True**
-        
-        The **uri** option will accept a comma or whitespace separated list of LDAP
-        server URIs to allow for failover behavior when connection errors are
-        encountered.  Connections will be attempted against the servers in order,
-        with **retry_max** attempts per URI before failing over to the next server.
-        
-        The **connection** method takes two options:
-        
-        - **bind**: bind used to connect. If None, uses the pool default's.
-          **default: None**
-        - **passwd**: password used to connect. If None, uses the pool default's.
-          **default: None**
-        
-        
-Platform: UNKNOWN
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5

ldappool-2.4.1/ldappool.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "01d0eb3", "is_release": true}

ldappool-2.4.1/ldappool.egg-info/requires.txt

@@ -1,2 +0,0 @@
-python-ldap>=3.0.0
-PrettyTable<0.8,>=0.7.2

ldappool-2.4.1/lower-constraints.txt

@@ -1,36 +0,0 @@
-alabaster==0.7.10
-Babel==2.3.4
-coverage==4.0
-docutils==0.11
-dulwich==0.15.0
-extras==1.0.0
-fixtures==3.0.0
-flake8-docstrings==0.2.1.post1
-flake8==2.5.5
-hacking==0.12.0
-imagesize==0.7.1
-Jinja2==2.10
-linecache2==1.0.0
-MarkupSafe==1.0
-mccabe==0.2.1
-openstackdocstheme==1.18.1
-pbr==2.0.0
-pep257==0.7.0
-pep8==1.5.7
-prettytable==0.7.2
-pyflakes==0.8.1
-Pygments==2.2.0
-python-ldap==3.0.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-requests==2.14.2
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinxcontrib-websupport==1.0.1
-stestr==2.0.0
-testresources==2.0.0
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0

ldappool-2.4.1/requirements.txt

@@ -1,5 +0,0 @@
-# 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.
-python-ldap>=3.0.0 # PSF
-PrettyTable<0.8,>=0.7.2

ldappool-2.4.1/setup.cfg

@@ -1,44 +0,0 @@
-[metadata]
-name = ldappool
-summary = A simple connector pool for python-ldap.
-description-file = 
-	README.rst
-author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = https://git.openstack.org/cgit/openstack/ldappool
-classifier = 
-	Intended Audience :: Developers
-	License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-	Operating System :: POSIX :: Linux
-	Programming Language :: Python
-	Programming Language :: Python :: 2
-	Programming Language :: Python :: 2.7
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.5
-
-[files]
-packages = 
-	ldappool
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
-[pbr]
-autodoc_tree_index_modules = True
-autodoc_tree_excludes = 
-	setup.py
-	ldappool/tests/
-
-[wheel]
-universal = 1
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

ldappool-2.4.1/test-requirements.txt

@@ -1,15 +0,0 @@
-# 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.
-# of appearance.
-
-hacking>=1.1.0,<1.2.0 # Apache-2.0
-flake8-docstrings==0.2.1.post1 # MIT
-
-coverage!=4.4,>=4.0 # Apache-2.0
-fixtures>=3.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-stestr>=2.0.0 # Apache-2.0
-testresources>=2.0.0 # Apache-2.0/BSD
-testtools>=2.2.0 # MIT

ldappool-2.4.1/tox.ini

@@ -1,71 +0,0 @@
-[tox]
-minversion = 2.0
-skipsdist = True
-envlist = py27,py35,py36,py37,pep8,cover,docs,releasenotes
-
-[testenv]
-usedevelop = True
-install_command = pip install {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
-         OS_STDOUT_NOCAPTURE=False
-         OS_STDERR_NOCAPTURE=False
-
-deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-commands = find . -type f -name "*.pyc" -delete
-           stestr run --slowest {posargs}
-whitelist_externals = find
-
-[testenv:pep8]
-basepython = python3
-commands =
-  flake8
-
-[testenv:venv]
-basepython = python3
-commands = {posargs}
-
-[testenv:cover]
-basepython = python3
-setenv =
-    PYTHON=coverage run --source ldappool --parallel-mode
-commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
-
-[flake8]
-# D100: Missing docstring in public module
-# D101: Missing docstring in public class
-# D102: Missing docstring in public method
-# D103: Missing docstring in public function
-# D104: Missing docstring in public package
-# D105: Missing docstring in magic method
-# D200: One-line docstring should fit on one line with quotes
-# D210: No whitespaces allowed surrounding docstring text
-# D401: First line should be in imperative mood
-ignore = D100,D101,D102,D104,D105,D200,D210,D401
-show-source = True
-exclude = .venv,.tox,dist,doc,*egg,build
-
-[testenv:docs]
-basepython = python3
-commands=
-    python setup.py build_sphinx
-
-[testenv:releasenotes]
-basepython = python3
-deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-    -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
-[testenv:lower-constraints]
-basepython = python3
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt