[tryton-debian-vcs] tryton-modules-ldap-authentication branch debian updated. debian/3.4.0-1-6-gd74d183

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=debian/3.4.0-1-6-gd74d183

commit d74d1839e37bad3157b94217d3dd9acdcc5e69d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 20:26:48 2015 +0100

    Releasing debian version 3.4.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index ccffec9..2303b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-ldap-authentication (3.4.1-1) unstable; urgency=medium
+
+  * Correcting NEWS for the now included migration in tryton-server.
+  * Adding actual upstream signing key.
+  * Improving boilerplate in d/control (Closes: #771722).
+  * Merging upstream version 3.4.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 20:26:48 +0100
+
 tryton-modules-ldap-authentication (3.4.0-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit ba8211e47d65ab0ad75f3069f8eb314b84b79de0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 20:26:46 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 3f74a65..01210fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2006-2014 Cédric Krier
+Copyright: 2006-2015 Cédric Krier
            2009-2012 Bertrand Chenal
-           2009-2014 B2CK SPRL
+           2009-2015 B2CK SPRL
            2008-2012 Udo Spallek
            2008-2011 virtual things
 License: GPL-3+
commit 17f153b64b496a6af8f25eb68fdb15bbdf47f355
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 20:26:46 2015 +0100

    Merging upstream version 3.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index 109cd4e..b0c8923 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-26
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 * Use trytond configuration for connection
diff --git a/COPYRIGHT b/COPYRIGHT
index c7afa3f..1e8c07c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2014 Cédric Krier.
+Copyright (C) 2006-2015 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2014 B2CK SPRL.
+Copyright (C) 2009-2015 B2CK SPRL.
 Copyright (C) 2008-2012 Udo Spallek.
 Copyright (C) 2008-2011 virtual things.
 
diff --git a/INSTALL b/INSTALL
index 1a63572..f49e587 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,6 @@ Prerequisites
 
  * Python 2.7 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
- * trytond_ldap_connection (http://www.tryton.org/)
  * python-ldap (http://python-ldap.sourceforge.net/)
 
 Installation
diff --git a/PKG-INFO b/PKG-INFO
index 2889fc0..be04963 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_ldap_authentication
-Version: 3.4.0
+Version: 3.4.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 31ac1f9..e31f512 100644
--- a/res.py
+++ b/res.py
@@ -14,6 +14,11 @@ __metaclass__ = PoolMeta
 logger = logging.getLogger(__name__)
 section = 'ldap_authentication'
 
+# Old version of urlparse doesn't parse query for ldap
+# see http://bugs.python.org/issue9374
+if hasattr(urlparse, 'uses_query') and 'ldap' not in urlparse.uses_query:
+    urlparse.uses_query.append('ldap')
+
 
 def parse_ldap_url(uri):
     unquote = urlparse.unquote
@@ -44,9 +49,9 @@ def ldap_connection():
     if 'tls' in uri.scheme:
         conn.start_tls_s()
 
-    bindname = extensions.get('bindname')
+    bindname, = extensions.get('bindname', [None])
     if not bindname:
-        bindname = extensions.get('!bindname')
+        bindname, = extensions.get('!bindname', [None])
     if bindname:
         # XXX find better way to get the password
         conn.simple_bind_s(bindname, config.get(section, 'bind_pass'))
@@ -105,7 +110,7 @@ class User:
         except ldap.LDAPError, e:
             logger.error('LDAPError: %s' % str(e))
         if find:
-            cls.raise_user_error('set_passwd_ldap_user', (login.rec_name,))
+            cls.raise_user_error('set_passwd_ldap_user', (login,))
 
     @classmethod
     def create(cls, vlist):
diff --git a/tryton.cfg b/tryton.cfg
index de04464..5b29448 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 depends:
     ir
     res
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index b4310ff..e9aa2db 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: 3.4.0
+Version: 3.4.1
 Summary: Tryton module to authenticate users through LDAP
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-ldap-authentication