[tryton-debian-vcs] tryton-server branch upstream updated. upstream/3.6.0-2-ge4d73b2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jul 15 14:23:30 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.6.0-2-ge4d73b2
commit e4d73b2364009babb943d73ec295a897c41b77d4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 14:09:48 2015 +0200
Adding upstream version 3.6.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5be6883..0a8a464 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.1 - 2015-05-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3063a3d..6be4fae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.6.1
+Version: 3.6.2
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 3063a3d..6be4fae 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.6.1
+Version: 3.6.2
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 399c9c2..648a1a7 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
import time
from email import charset
-__version__ = "3.6.1"
+__version__ = "3.6.2"
os.environ['TZ'] = 'UTC'
if hasattr(time, 'tzset'):
diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py
index 9f55458..de31da2 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 4bc1879..6246846 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -4,6 +4,7 @@ import time
import logging
import re
import os
+import urllib
if os.name == 'posix':
import pwd
from decimal import Decimal
@@ -69,7 +70,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', default=1)
maxconn = config.getint('database', 'maxconn', default=64)
dsn = '%s %s %s %s %s' % (host, port, name, user, password)
diff --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py
index 704400d..23b8a79 100644
--- a/trytond/ir/trigger.py
+++ b/trytond/ir/trigger.py
@@ -77,7 +77,7 @@ class Trigger(ModelSQL, ModelView):
super(Trigger, cls).__register__(module_name)
# Migration from 3.4:
- # change minimum_delay into timedelta minimu_time_delay
+ # change minimum_delay into timedelta minimum_time_delay
if table.column_exist('minimum_delay'):
cursor.execute(*sql_table.select(
sql_table.id, sql_table.minimum_delay,
@@ -85,7 +85,7 @@ class Trigger(ModelSQL, ModelView):
for id_, delay in cursor.fetchall():
delay = datetime.timedelta(hours=delay)
cursor.execute(*sql_table.update(
- [sql_table.minimu_time_delay],
+ [sql_table.minimum_time_delay],
[delay],
where=sql_table.id == id_))
table.drop_column('minimum_delay')
diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py
index a590395..1951bd2 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -12,6 +12,7 @@ import smtplib
from array import array
from itertools import islice
import types
+import urllib
from sql import Literal
from sql.operators import Or
@@ -114,7 +115,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
commit 7d8745607b6da8236cd8dc1373babe90cea56e04
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jul 14 16:05:35 2015 +0200
Adding upstream version 3.6.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 75a39d1..5be6883 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-05-19
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Use bytes and bytearray for Binary
diff --git a/PKG-INFO b/PKG-INFO
index a676571..3063a3d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.6.0
+Version: 3.6.1
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 a676571..3063a3d 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.6.0
+Version: 3.6.1
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 99f7805..399c9c2 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
import time
from email import charset
-__version__ = "3.6.0"
+__version__ = "3.6.1"
os.environ['TZ'] = 'UTC'
if hasattr(time, 'tzset'):
diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py
index 9529d5c..4bc1879 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -151,6 +151,7 @@ class Database(DatabaseInterface):
database.create(cursor, database_name)
cursor.commit()
cursor.close()
+ database.close()
cmd = ['pg_restore', '--no-owner']
env = {}
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index 45eb7b3..68eb97c 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -302,10 +302,11 @@ class ModelStorage(Model):
or isinstance(f, fields.Property))]
ids = map(int, records)
datas = cls.read(ids, fields_names=fields_names)
+ datas = dict((d['id'], d) for d in datas)
field_defs = cls.fields_get(fields_names=fields_names)
to_create = []
- for data in datas:
- data = convert_data(field_defs, data)
+ for id in ids:
+ data = convert_data(field_defs, datas[id])
to_create.append(data)
new_records = cls.create(to_create)
new_ids = dict(izip(ids, map(int, new_records)))
--
tryton-server
More information about the tryton-debian-vcs
mailing list