[tryton-debian-vcs] tryton-modules-ldap-authentication branch upstream updated. upstream/4.2.1-1-g894f92b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:33:50 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=upstream/4.2.1-1-g894f92b
commit 894f92b998ef073f57ab4a3875f5a9a25eb5c8fc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:44 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index cf7b44a..507a6f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.2.1 - 2017-02-06
+Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
Version 4.2.0 - 2016-11-28
diff --git a/PKG-INFO b/PKG-INFO
index 0c20cbd..9b137ca 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 4.2.1
+Version: 4.4.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_ldap_authentication
===========================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/pl.po b/locale/pl.po
index a28cfa2..e9a3047 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr ""
+msgstr "Nie możesz ustawić hasła użytkownika \"%s\" w ldap."
diff --git a/res.py b/res.py
index 1f408be..9d40752 100644
--- a/res.py
+++ b/res.py
@@ -4,6 +4,8 @@ import logging
import urlparse
import ldap3
+from ldap3.core.exceptions import LDAPException
+
from trytond.transaction import Transaction
from trytond.pool import PoolMeta
from trytond.config import config, parse_uri
@@ -91,7 +93,7 @@ class User:
result = con.entries
if result and len(result) > 1:
logger.info('ldap_search_user found more than 1 user')
- return [(e.entry_get_dn(), e.entry_get_attributes_dict())
+ return [(e.entry_dn, e.entry_attributes_as_dict)
for e in result]
@classmethod
@@ -105,7 +107,7 @@ class User:
if cls.ldap_search_user(login, server, attrs=[]):
find = True
break
- except ldap3.LDAPException:
+ except LDAPException:
logger.error('LDAPError when checking password', exc_info=True)
if find:
cls.raise_user_error('set_passwd_ldap_user', (login,))
@@ -154,7 +156,7 @@ class User:
del values['password']
else:
cls.raise_user_error('wrong_password')
- except ldap3.LDAPException:
+ except LDAPException:
logger.error('LDAPError when setting preferences',
exc_info=True)
super(User, cls).set_preferences(values, parameters)
@@ -185,5 +187,5 @@ class User:
'login': login,
}])
return user.id
- except ldap3.LDAPException:
+ except LDAPException:
logger.error('LDAPError when login', exc_info=True)
diff --git a/setup.py b/setup.py
index 9c7023a..ccd4d37 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ if minor_version % 2:
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
-requires = ['ldap3 < 2']
+requires = ['ldap3 >= 2.0.7']
for dep in info.get('depends', []):
if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
@@ -80,7 +80,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 2652956..9556fed 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.1
+version=4.4.0
depends:
ir
res
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index fc8f126..5a0e59b 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 4.2.1
+Version: 4.4.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_ldap_authentication
===========================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index dfc24be..b386870 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,2 +1,2 @@
-ldap3 < 2
-trytond >= 4.2, < 4.3
+ldap3 >= 2.0.7
+trytond >= 4.4, < 4.5
--
tryton-modules-ldap-authentication
More information about the tryton-debian-vcs
mailing list