[tryton-debian-vcs] tryton-proteus branch debian updated. debian/4.0.1-1-2-g13e6911

[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-proteus.git;a=commitdiff;h=debian/4.0.1-1-2-g13e6911

commit 13e6911dfcb163fb2ce021f15f4bbbdde0bf4a8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 21:04:39 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 70192cd..9882c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (4.0.2-1) unstable; urgency=medium
+
+  * Merging upstream version 4.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 03 Sep 2016 21:04:39 +0200
+
 tryton-proteus (4.0.1-1) unstable; urgency=medium
 
   * Updating to Standards-Version: 3.9.8, no changes needed.
commit 20406ccf57a039cdc7ea40d1854c1627ee97c0cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 21:04:39 2016 +0200

    Merging upstream version 4.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index 0be9c46..c4a0a67 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.2 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.1 - 2016-08-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 7bf7c97..1a5b3ad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 4.0.1
+Version: 4.0.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 7bf7c97..1a5b3ad 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 4.0.1
+Version: 4.0.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus/__init__.py b/proteus/__init__.py
index b8552bb..79ae44d 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "4.0.1"
+__version__ = "4.0.2"
 __all__ = ['Model', 'Wizard', 'Report']
 import sys
 try:
@@ -646,8 +646,15 @@ class Model(object):
             definition = self._fields[field_name]
             if definition['type'] in ('one2many', 'many2many'):
                 relation = Model.get(definition['relation'])
-                value = [isinstance(x, (int, long)) and relation(x) or x
-                        for x in value]
+
+                def instantiate(v):
+                    if isinstance(v, (int, long)):
+                        return relation(v)
+                    elif isinstance(v, dict):
+                        return relation(_default=_default, **v)
+                    else:
+                        return v
+                value = [instantiate(x) for x in value]
                 getattr(self, field_name).extend(value)
             else:
                 if definition['type'] == 'many2one':
-- 
tryton-proteus