[tryton-debian-vcs] tryton-modules-ldap-authentication branch upstream updated. upstream/4.2.0-1-gd6b5098

[Mathias Behrle]

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.0-1-gd6b5098

commit d6b5098fa3dae828b591a3254ae806d85b6124a4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 8 11:08:15 2017 +0100

    Adding upstream version 4.2.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 4ce618f..cf7b44a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-02-06
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Add Python3 support
diff --git a/COPYRIGHT b/COPYRIGHT
index 458b81c..8e1ff5f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2016 Cédric Krier.
+Copyright (C) 2006-2017 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2016 B2CK SPRL.
+Copyright (C) 2009-2017 B2CK SPRL.
 Copyright (C) 2008-2012 Udo Spallek.
 Copyright (C) 2008-2011 virtual things.
 
diff --git a/PKG-INFO b/PKG-INFO
index 2ec753b..0c20cbd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_ldap_authentication
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to authenticate users through LDAP
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/res.py b/res.py
index 4e6a3f9..1f408be 100644
--- a/res.py
+++ b/res.py
@@ -157,7 +157,7 @@ class User:
             except ldap3.LDAPException:
                 logger.error('LDAPError when setting preferences',
                     exc_info=True)
-        super(User, cls).set_preferences(values, old_password=old_password)
+        super(User, cls).set_preferences(values, parameters)
 
     @classmethod
     def _login_ldap(cls, login, parameters):
diff --git a/setup.py b/setup.py
index b65bc07..9c7023a 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']
+requires = ['ldap3 < 2']
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
diff --git a/tryton.cfg b/tryton.cfg
index 45de99f..2652956 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     res
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index f85b027..fc8f126 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-ldap-authentication
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to authenticate users through LDAP
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 5dc1bcb..dfc24be 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,2 +1,2 @@
-ldap3
+ldap3 < 2
 trytond >= 4.2, < 4.3
-- 
tryton-modules-ldap-authentication