[tryton-debian-vcs] tryton-server branch debian updated. debian/3.0.1-1-3-gfc98e74

[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-server.git;a=commitdiff;h=debian/3.0.1-1-3-gfc98e74

commit fc98e74779ac0cf626b9d206f583e14747a1d00a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 19 20:04:26 2014 +0100

    Releasing debian version 3.0.2-1.

diff --git a/debian/changelog b/debian/changelog
index a730b39..3995138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-server (3.0.2-1) unstable; urgency=medium
+
+  * Using dpkg-statoverride to allow local overrides of (otherwise)
+    enforced restricted access permissions to /etc/trytond.conf,
+    /var/lib/tryton and /var/log/tryton.
+  * Merging upstream version 3.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 19 Jan 2014 19:43:23 +0100
+
 tryton-server (3.0.1-1) unstable; urgency=low
 
   * Merging upstream version 3.0.1.
commit d1d6fc3f62875d41570ff52105c5f88c69ad191b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 19 19:36:31 2014 +0100

    Merging upstream version 3.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index 8ab9272..827c7db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.1 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 3a366aa..9fd8c2a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.1
+Version: 3.0.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 3a366aa..9fd8c2a 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.0.1
+Version: 3.0.2
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/cron.py b/trytond/ir/cron.py
index 3255b82..904a2fd 100644
--- a/trytond/ir/cron.py
+++ b/trytond/ir/cron.py
@@ -7,6 +7,7 @@ import traceback
 import sys
 import logging
 from email.mime.text import MIMEText
+from email.header import Header
 
 from ..model import ModelView, ModelSQL, fields
 from ..tools import safe_eval, get_smtp_server
@@ -135,10 +136,10 @@ class Cron(ModelSQL, ModelView):
         from_addr = CONFIG['smtp_default_from_email']
         to_addr = cron.request_user.email
 
-        msg = MIMEText(body)
+        msg = MIMEText(body, _charset='utf-8')
         msg['To'] = to_addr
         msg['From'] = from_addr
-        msg['Subject'] = subject
+        msg['Subject'] = Header(subject, 'utf-8')
         logger = logging.getLogger(__name__)
         if not to_addr:
             logger.error(msg.as_string())
diff --git a/trytond/protocols/dispatcher.py b/trytond/protocols/dispatcher.py
index 61bd7da..81e8dfc 100644
--- a/trytond/protocols/dispatcher.py
+++ b/trytond/protocols/dispatcher.py
@@ -7,7 +7,7 @@ import time
 import sys
 import pydoc
 
-from sql import Table
+from sql import Table, Flavor
 
 from trytond.pool import Pool
 from trytond import security
@@ -86,6 +86,7 @@ def dispatch(host, port, protocol, database_name, user, session, object_type,
             if CONFIG['prevent_dblist']:
                 raise Exception('AccessDenied')
             database = Database().connect()
+            Flavor.set(Database.flavor)
             try:
                 cursor = database.cursor()
                 try:
@@ -161,18 +162,18 @@ def dispatch(host, port, protocol, database_name, user, session, object_type,
         with Transaction().start(database_name, user,
                 readonly=rpc.readonly) as transaction:
             try:
-                args, kwargs, transaction.context, transaction.timestamp = \
-                    rpc.convert(obj, *args, **kwargs)
+                c_args, c_kwargs, transaction.context, transaction.timestamp \
+                    = rpc.convert(obj, *args, **kwargs)
                 meth = getattr(obj, method)
                 if not hasattr(meth, 'im_self') or meth.im_self:
-                    result = rpc.result(meth(*args, **kwargs))
+                    result = rpc.result(meth(*c_args, **c_kwargs))
                 else:
                     assert rpc.instantiate == 0
-                    inst = args.pop(0)
+                    inst = c_args.pop(0)
                     if hasattr(inst, method):
-                        result = rpc.result(meth(inst, *args, **kwargs))
+                        result = rpc.result(meth(inst, *c_args, **c_kwargs))
                     else:
-                        result = [rpc.result(meth(i, *args, **kwargs))
+                        result = [rpc.result(meth(i, *c_args, **c_kwargs))
                             for i in inst]
                 if not rpc.readonly:
                     transaction.cursor.commit()
diff --git a/trytond/rpc.py b/trytond/rpc.py
index b9eed3a..afa0827 100644
--- a/trytond/rpc.py
+++ b/trytond/rpc.py
@@ -23,6 +23,7 @@ class RPC(object):
 
     def convert(self, obj, *args, **kwargs):
         args = list(args)
+        kwargs = kwargs.copy()
         if 'context' in kwargs:
             context = kwargs.pop('context')
         else:
diff --git a/trytond/version.py b/trytond/version.py
index 95e95bc..37aca7a 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.0.1"
+VERSION = "3.0.2"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server