[tryton-debian-vcs] tryton-proteus branch debian-stretch-3.8 updated. debian/3.8.3-1-2-g2097be6
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Sep 4 17:00:57 UTC 2016
The following commit has been merged in the debian-stretch-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-proteus.git;a=commitdiff;h=debian/3.8.3-1-2-g2097be6
commit 2097be6e56fe0b0dac419d14df1c69e03da263ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 21:09:31 2016 +0200
Releasing debian version 3.8.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9c75b3d..65a0346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (3.8.4-1) unstable; urgency=medium
+
+ * Merging upstream version 3.8.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 03 Sep 2016 21:09:31 +0200
+
tryton-proteus (3.8.3-1) unstable; urgency=medium
* Merging upstream version 3.8.3.
commit 2c89f3298dcf30f26a704343caaa092a997f33cd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 21:09:31 2016 +0200
Merging upstream version 3.8.4.
diff --git a/CHANGELOG b/CHANGELOG
index e3d6ec5..977b4e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.4 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.3 - 2016-08-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 7c26124..0209fc2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: proteus
-Version: 3.8.3
+Version: 3.8.4
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 7c26124..0209fc2 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: proteus
-Version: 3.8.3
+Version: 3.8.4
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 de5b982..4dbeae9 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
'''
A library to access Tryton's models like a client.
'''
-__version__ = "3.8.3"
+__version__ = "3.8.4"
__all__ = ['Model', 'Wizard', 'Report']
import sys
try:
@@ -647,8 +647,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
More information about the tryton-debian-vcs
mailing list