[tryton-debian-vcs] tryton-server branch debian-jessie-3.4 updated. debian/3.4.4-1-2-gb553a0b

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.4.4-1-2-gb553a0b

commit b553a0b40de6f502d74ef0528134b47411a574da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 14:13:25 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 9690cf4..74b5753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.4.5-1) unstable; urgency=medium
+
+  * Merging upstream version 3.4.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 15 Jul 2015 14:13:25 +0200
+
 tryton-server (3.4.4-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit 9f3c6fe05e9251477575965d8810b663cced5be5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 14:13:24 2015 +0200

    Merging upstream version 3.4.5.

diff --git a/CHANGELOG b/CHANGELOG
index 4e58c26..48a24d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.5 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.4 - 2015-05-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 157b7a5..dc454b1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.4
+Version: 3.4.5
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 157b7a5..dc454b1 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.4
+Version: 3.4.5
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py
index 4960cfc..d3c0509 100644
--- a/trytond/backend/mysql/database.py
+++ b/trytond/backend/mysql/database.py
@@ -10,6 +10,8 @@ from MySQLdb import OperationalError as DatabaseOperationalError
 import os
 import time
 import tempfile
+import urllib
+
 from sql import Flavor, Expression
 from sql.functions import Extract, Overlay, CharLength
 
@@ -100,7 +102,7 @@ class Database(DatabaseInterface):
         if uri.username:
             args['user'] = uri.username
         if uri.password:
-            args['passwd'] = uri.password
+            args['passwd'] = urllib.unquote_plus(uri.password)
         conn = MySQLdb.connect(**args)
         cursor = Cursor(conn, self.database_name)
         cursor.execute('SET time_zone = `UTC`')
diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py
index c0ebb41..3cdbbb2 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -18,6 +18,7 @@ import time
 import logging
 import re
 import os
+import urllib
 if os.name == 'posix':
     import pwd
 from decimal import Decimal
@@ -60,7 +61,8 @@ class Database(DatabaseInterface):
         port = uri.port and "port=%s" % uri.port or ''
         name = "dbname=%s" % self.database_name
         user = uri.username and "user=%s" % uri.username or ''
-        password = uri.password and "password=%s" % uri.password or ''
+        password = ("password=%s" % urllib.unquote_plus(uri.password)
+            if uri.password else '')
         minconn = config.getint('database', 'minconn', 1)
         maxconn = config.getint('database', 'maxconn', 64)
         dsn = '%s %s %s %s %s' % (host, port, name, user, password)
diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py
index ebe7c66..39fc673 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -13,6 +13,8 @@ import dis
 from decimal import Decimal
 from array import array
 from itertools import islice
+import urllib
+
 from sql import Literal
 from sql.operators import Or
 
@@ -114,7 +116,9 @@ def get_smtp_server():
         smtp_server.starttls()
 
     if uri.username and uri.password:
-        smtp_server.login(uri.username, uri.password)
+        smtp_server.login(
+            urllib.unquote_plus(uri.username),
+            urllib.unquote_plus(uri.password))
 
     return smtp_server
 
diff --git a/trytond/version.py b/trytond/version.py
index 3e50d7f..7b916ac 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.4.4"
+VERSION = "3.4.5"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server