From 88c172de0a3b4e172a2cce0cc466d345326efd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:56:59 +0200 Subject: [PATCH 01/10] Increase version number --- proteus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proteus/__init__.py b/proteus/__init__.py index 2484c0151e..f2ec0cdccd 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -3,7 +3,7 @@ ''' A library to access Tryton's models like a client. ''' -__version__ = "2.6.0" +__version__ = "2.6.1" __all__ = ['Model', 'Wizard'] import sys try: From 7f505f73220e8e4b9cb24467f82f602dddd79176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 24 Oct 2012 23:58:47 +0200 Subject: [PATCH 02/10] Set default context to dict if None review584002 (transplanted from 68c3e7dfc19ca6950ec10f7d00de293731b887ff) --- proteus/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proteus/config.py b/proteus/config.py index 5ff579f477..436ce8ecb6 100644 --- a/proteus/config.py +++ b/proteus/config.py @@ -101,7 +101,7 @@ class Config(object): ctx_manager = ContextManager(self) if context is None: - context = None + context = {} self._context = self.context self._context.update(context) self._context.update(kwargs) From 7e1df6b0fddbe302d6e91ec3544e09f09ffa0344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:50:12 +0100 Subject: [PATCH 03/10] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3a1a79d090..c9af7ca10d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) From 70ec48e17b5b45045e6d6966e10afc120ae11a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:50:13 +0100 Subject: [PATCH 04/10] Added tag 2.6.1 for changeset 096905f6b43b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6bb8d03cc7..2db5e17c74 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ c8fdae3b2338b744fce709572958884a95de87b3 2.0.0 120d0435125cf3a3c28280321962571924ad422f 2.2.0 ef9846cb18afe62182de446d8e4fa7b8393f7168 2.4.0 648c43939fd698988bde5b54f7a1dff9d47922af 2.6.0 +096905f6b43bcdc204dc7dd903abf6cb92525c34 2.6.1 From af81eff787a5f7a22d54bd9e3a300a62391396b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:50:21 +0100 Subject: [PATCH 05/10] Increase version number --- proteus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proteus/__init__.py b/proteus/__init__.py index f2ec0cdccd..96d09f5205 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -3,7 +3,7 @@ ''' A library to access Tryton's models like a client. ''' -__version__ = "2.6.1" +__version__ = "2.6.2" __all__ = ['Model', 'Wizard'] import sys try: From e2489d31d08aae76b394613ac2331b670c7ca846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Feb 2013 22:52:29 +0100 Subject: [PATCH 06/10] Remove hard-coded end state of Wizard (transplanted from 71a089de7c84cd68013a33749e9505cf3a391a33) --- proteus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proteus/__init__.py b/proteus/__init__.py index 96d09f5205..7cf493718c 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -879,7 +879,7 @@ class Wizard(object): assert state in self.states self.state = state - while self.state != 'end': + while self.state != self.end_state: ctx = self._context.copy() ctx.update(self._config.context) if self.models: From 68eb98c14244ad404577d445fdc63e481052e354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 22 Mar 2013 17:40:15 +0100 Subject: [PATCH 07/10] class name must be string and not unicode The class name in reference could be unicode but type accept only string as name. review724002 (transplanted from c9ee01676c6b858cc2572e532f141de11e315e6c) --- proteus/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proteus/__init__.py b/proteus/__init__.py index 7cf493718c..beac2fc924 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -586,6 +586,9 @@ class Model(object): @classmethod def get(cls, name, config=None): 'Get a class for the named Model' + if isinstance(name, unicode): + name = name.encode('utf-8') + class Spam(Model): __metaclass__ = MetaModelFactory(name, config=config)() return Spam From 21af4bf6fd3a276d9de1a8dc082de9732574b609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:43:11 +0200 Subject: [PATCH 08/10] Prepare release 2.6.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c9af7ca10d..baf80b3eab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.6.1 - 2012-11-05 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index e792a2ca59..7e8c156c3f 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2010-2012 Cédric Krier. -Copyright (C) 2010-2012 B2CK SPRL. +Copyright (C) 2010-2013 Cédric Krier. +Copyright (C) 2010-2013 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 2e9de97ff02b8f2bdb4c8d4ac5995805f351a0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:43:12 +0200 Subject: [PATCH 09/10] Added tag 2.6.2 for changeset c20339f321b9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2db5e17c74..60c3ec9fa9 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ c8fdae3b2338b744fce709572958884a95de87b3 2.0.0 ef9846cb18afe62182de446d8e4fa7b8393f7168 2.4.0 648c43939fd698988bde5b54f7a1dff9d47922af 2.6.0 096905f6b43bcdc204dc7dd903abf6cb92525c34 2.6.1 +c20339f321b9efa4f3c8efc58b616b456d2573ca 2.6.2 From 605a65392bc48737831c5bba2cb246de7e1483f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:43:20 +0200 Subject: [PATCH 10/10] Increase version number --- proteus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proteus/__init__.py b/proteus/__init__.py index beac2fc924..a4b07bb20c 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -3,7 +3,7 @@ ''' A library to access Tryton's models like a client. ''' -__version__ = "2.6.2" +__version__ = "2.6.3" __all__ = ['Model', 'Wizard'] import sys try: