[Python-modules-commits] [django-python3-ldap] 01/01: New upstream version 0.11.1

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch upstream
in repository django-python3-ldap.

commit b44b072e40abc4c7cce040e2237aea181d94e7ec
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Dec 11 11:30:22 2017 +0100

    New upstream version 0.11.1
---
 CHANGELOG.rst                         |  6 ++++++
 PKG-INFO                              |  3 ++-
 README.rst                            |  6 +++++-
 django_python3_ldap.egg-info/PKG-INFO |  3 ++-
 django_python3_ldap/__init__.py       |  2 +-
 django_python3_ldap/conf.py           | 10 ++++++++++
 django_python3_ldap/ldap.py           |  2 ++
 setup.cfg                             |  1 -
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2aab52f..27c50e7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 django-python3-ldap changelog
 =============================
 
+0.11.1
+------
+
+- Added `LDAP_AUTH_CONNECT_TIMEOUT` and `LDAP_AUTH_RECEIVE_TIMEOUT` settings (@alizain).
+
+
 0.11.0
 ------
 
diff --git a/PKG-INFO b/PKG-INFO
index 2080b34..273aff2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
 Metadata-Version: 1.1
 Name: django-python3-ldap
-Version: 0.11.0
+Version: 0.11.1
 Summary: Django LDAP user authentication backend for Python 3.
 Home-page: https://github.com/etianen/django-python3-ldap
 Author: Dave Hall
 Author-email: dave at etianen.com
 License: BSD
+Description-Content-Type: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
diff --git a/README.rst b/README.rst
index cabac67..ac1b9a6 100644
--- a/README.rst
+++ b/README.rst
@@ -86,6 +86,10 @@ Available settings
     LDAP_AUTH_CONNECTION_USERNAME = None
     LDAP_AUTH_CONNECTION_PASSWORD = None
 
+    # Set connection/receive timeouts (in seconds) on the underlying `ldap3` library.
+    LDAP_AUTH_CONNECT_TIMEOUT = None
+    LDAP_AUTH_RECEIVE_TIMEOUT = None
+
 
 Microsoft Active Directory support
 ----------------------------------
@@ -156,7 +160,7 @@ callable.
     # settings.py
     LDAP_AUTH_FORMAT_SEARCH_FILTERS = "path.to.your.custom_format_search_filters"
 
-    # pay/to/your.py
+    # path/to/your/module.py
     from django_python3_ldap.utils import format_search_filters
 
     def custom_format_search_filters(ldap_fields):
diff --git a/django_python3_ldap.egg-info/PKG-INFO b/django_python3_ldap.egg-info/PKG-INFO
index 2080b34..273aff2 100644
--- a/django_python3_ldap.egg-info/PKG-INFO
+++ b/django_python3_ldap.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
 Metadata-Version: 1.1
 Name: django-python3-ldap
-Version: 0.11.0
+Version: 0.11.1
 Summary: Django LDAP user authentication backend for Python 3.
 Home-page: https://github.com/etianen/django-python3-ldap
 Author: Dave Hall
 Author-email: dave at etianen.com
 License: BSD
+Description-Content-Type: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
diff --git a/django_python3_ldap/__init__.py b/django_python3_ldap/__init__.py
index c34f6e8..c1da766 100644
--- a/django_python3_ldap/__init__.py
+++ b/django_python3_ldap/__init__.py
@@ -3,4 +3,4 @@ Django LDAP user authentication backend for Python 3.
 """
 
 
-__version__ = (0, 11, 0)
+__version__ = (0, 11, 1)
diff --git a/django_python3_ldap/conf.py b/django_python3_ldap/conf.py
index 3921205..35811fb 100644
--- a/django_python3_ldap/conf.py
+++ b/django_python3_ldap/conf.py
@@ -115,5 +115,15 @@ class LazySettings(object):
         default=None,
     )
 
+    LDAP_AUTH_CONNECT_TIMEOUT = LazySetting(
+        name="LDAP_AUTH_CONNECT_TIMEOUT",
+        default=None
+    )
+
+    LDAP_AUTH_RECEIVE_TIMEOUT = LazySetting(
+        name="LDAP_AUTH_RECEIVE_TIMEOUT",
+        default=None
+    )
+
 
 settings = LazySettings(settings)
diff --git a/django_python3_ldap/ldap.py b/django_python3_ldap/ldap.py
index 6f49ae4..1217e3d 100644
--- a/django_python3_ldap/ldap.py
+++ b/django_python3_ldap/ldap.py
@@ -150,11 +150,13 @@ def connection(**kwargs):
                 settings.LDAP_AUTH_URL,
                 allowed_referral_hosts=[("*", True)],
                 get_info=ldap3.NONE,
+                connect_timeout=settings.LDAP_AUTH_CONNECT_TIMEOUT,
             ),
             user=username,
             password=password,
             auto_bind=auto_bind,
             raise_exceptions=True,
+            receive_timeout=settings.LDAP_AUTH_RECEIVE_TIMEOUT,
         )
     except LDAPException as ex:
         logger.warning("LDAP connect failed: {ex}".format(ex=ex))
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-python3-ldap.git