[tryton-debian-vcs] tryton-modules-webdav branch upstream updated. upstream/4.2.0-1-g4434119

[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-webdav.git;a=commitdiff;h=upstream/4.2.0-1-g4434119

commit 443411961cfe1b0a742e0f3ed83ab50c36a50f87
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 8 10:56:30 2017 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 122bd23..afe78b4 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)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 442fb2d..5d0de2b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2016 Cédric Krier.
-Copyright (C) 2012-2016 B2CK SPRL.
+Copyright (C) 2012-2017 Cédric Krier.
+Copyright (C) 2012-2017 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 5c33094..a8c1d24 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_webdav
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for webdav
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/protocol.py b/protocol.py
index 3177097..374206b 100644
--- a/protocol.py
+++ b/protocol.py
@@ -567,9 +567,10 @@ class WebDAVAuthRequestHandler(WebDAVServer.DAVRequestHandler):
             return True
         if user:
             parameters = {'password': password}
-            user = int(login(dbname, user, parameters, cache=False))
+            user = login(dbname, user, parameters, cache=False)
             if not user:
                 return None
+            user = int(user)
         else:
             url = urlparse.urlparse(self.path)
             query = urlparse.parse_qs(url.query)
diff --git a/tryton.cfg b/tryton.cfg
index 1bf6961..309ca53 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_webdav.egg-info/PKG-INFO b/trytond_webdav.egg-info/PKG-INFO
index 6e0bd21..fe03bf4 100644
--- a/trytond_webdav.egg-info/PKG-INFO
+++ b/trytond_webdav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-webdav
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for webdav
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-webdav