[tryton-debian-vcs] tryton-server branch upstream-2.6 updated. upstream/2.6.8-1-g4f381f8

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/2.6.8-1-g4f381f8

commit 4f381f83a9b46debc0d1baee6d85dc22e2c82b14
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 20 18:22:25 2014 +0100

    Adding upstream version 2.6.9.

diff --git a/CHANGELOG b/CHANGELOG
index edff9da..000053c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.9 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.8 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 72b41cb..01adab7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.8
+Version: 2.6.9
 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 72b41cb..01adab7 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.8
+Version: 2.6.9
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/protocols/dispatcher.py b/trytond/protocols/dispatcher.py
index 41df078..9d9b917 100644
--- a/trytond/protocols/dispatcher.py
+++ b/trytond/protocols/dispatcher.py
@@ -147,18 +147,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 0434b1a..423f5b6 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 = "2.6.8"
+VERSION = "2.6.9"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server