[tryton-debian-vcs] tryton-server branch upstream updated. upstream/4.0.4-1-g9e4b76f

[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-server.git;a=commitdiff;h=upstream/4.0.4-1-g9e4b76f

commit 9e4b76fbf7c91ded21a6fb90d05049b6b72ad408
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 8 09:17:04 2016 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 4aa2e57..ea2f667 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.5 - 2016-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.4 - 2016-08-30
 * Bug fixes (see mercurial logs for details)
 * Sanitize path in file_open (CVE-2016-1242)
diff --git a/PKG-INFO b/PKG-INFO
index cfca32d..4e6d392 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 4.0.4
+Version: 4.0.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 cfca32d..4e6d392 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 4.0.4
+Version: 4.0.5
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 50b4167..5bc87e1 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -5,7 +5,7 @@ import time
 import logging
 from email import charset
 
-__version__ = "4.0.4"
+__version__ = "4.0.5"
 logger = logging.getLogger(__name__)
 
 os.environ['TZ'] = 'UTC'
diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py
index ff5a91a..8a3e916 100644
--- a/trytond/backend/sqlite/database.py
+++ b/trytond/backend/sqlite/database.py
@@ -328,7 +328,7 @@ class Database(DatabaseInterface):
 
     def init(self):
         from trytond.modules import get_module_info
-        with self._conn as conn:
+        with self.get_connection() as conn:
             cursor = conn.cursor()
             sql_file = os.path.join(os.path.dirname(__file__), 'init.sql')
             with open(sql_file) as fp:
diff --git a/trytond/ir/cron.py b/trytond/ir/cron.py
index 9e384fc..0dfa2f5 100644
--- a/trytond/ir/cron.py
+++ b/trytond/ir/cron.py
@@ -143,7 +143,9 @@ class Cron(ModelSQL, ModelView):
         with Transaction().set_user(self.user.id), \
                 Transaction().set_context(language=language):
             tb_s = ''.join(traceback.format_exception(*sys.exc_info()))
-            tb_s = tb_s.decode('utf-8', 'ignore')
+            # On Python3, the traceback is already a unicode
+            if hasattr(tb_s, 'decode'):
+                tb_s = tb_s.decode('utf-8', 'ignore')
             subject = self.raise_user_error('request_title',
                 raise_exception=False)
             body = self.raise_user_error('request_body',
-- 
tryton-server