[tryton-debian-vcs] tryton-proteus branch debian created. a6844b788d011436a2d804cc8572cc53f0499d11
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:13:08 UTC 2013
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=a6844b788d011436a2d804cc8572cc53f0499d11
commit a6844b788d011436a2d804cc8572cc53f0499d11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:43 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index cd7d0a2..8fc2aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-proteus (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:55:58 +0100
+
tryton-proteus (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 3afe14ac88b583eb121316f96760d49987c4891c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index a48186e..102cbba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends:
- debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
+ debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools,
+ dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 92e554abad8d765bcb1c5b72108ee5bbbf47c4aa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 889a182..a48186e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends:
debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
Vcs-Git: git://debian.tryton.org/packages/tryton-proteus.git
commit 1f7ff8529e97574b5c9266e7e03bfa179f6561ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:49 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 628c5ee..6579877 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
* Add support of fields.Dict
diff --git a/PKG-INFO b/PKG-INFO
index 528d96a..9a334cb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: proteus
-Version: 2.8.0
+Version: 3.0.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: proteus
=======
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 528d96a..9a334cb 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: proteus
-Version: 2.8.0
+Version: 3.0.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: proteus
=======
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index d9c9147..2275f28 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -4,7 +4,7 @@ python-dateutil
cdecimal
[trytond]
-trytond >= 2.8, < 2.9
+trytond >= 3.0, < 3.1
[simplejson]
simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 257d1c9..9843977 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.8.0"
+__version__ = "3.0.0"
__all__ = ['Model', 'Wizard']
import sys
try:
@@ -351,6 +351,7 @@ class MetaModelFactory(object):
'reference': ReferenceDescriptor,
'date': DateDescriptor,
'datetime': DateTimeDescriptor,
+ 'timestamp': DateTimeDescriptor,
'time': TimeDescriptor,
'dict': DictDescriptor,
'many2one': Many2OneDescriptor,
@@ -630,7 +631,8 @@ class Model(object):
def __cmp__(self, other):
'Compare with other'
if isinstance(other, Model):
- return cmp(self.id, other.id)
+ return cmp((self.__class__.__name__, self.id),
+ (other.__class__.__name__, other.id))
if isinstance(other, (bool, NoneType)):
return 1
raise NotImplementedError
diff --git a/proteus/config.py b/proteus/config.py
index 436ce8e..39a3148 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -178,10 +178,11 @@ class TrytondConfig(Config):
super(TrytondConfig, self).__init__()
from trytond.config import CONFIG
CONFIG.update_etc(config_file)
+ CONFIG.set_timezone()
if database_type is not None:
CONFIG['db_type'] = database_type
from trytond.pool import Pool
- from trytond.backend import Database
+ from trytond import backend
from trytond.protocols.dispatcher import create
from trytond.cache import Cache
from trytond.transaction import Transaction
@@ -197,12 +198,9 @@ class TrytondConfig(Config):
Pool.start()
- database = Database().connect()
- cursor = database.cursor()
- try:
- databases = database.list(cursor)
- finally:
- cursor.close()
+ with Transaction().start(None, 0) as transaction:
+ cursor = transaction.cursor
+ databases = backend.get('Database').list(cursor)
if database_name not in databases:
create(database_name, CONFIG['admin_passwd'], language, password)
commit e2ea684b802fcbf4771d2fbf1074874431af8b24
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:21:19 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index 133dc67..cd7d0a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:33:56 +0200
+
tryton-proteus (2.8.0-2) unstable; urgency=low
* Removing needless empty line in rules.
commit 3d6c886952fba48df773b5451ee2b71b8219e0ae
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index b918925..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,27 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
+
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
+
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 79471fbea8a7c87a646702d2d9dc72b578c8b623
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:38 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index 79356a1..133dc67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (2.8.0-2) unstable; urgency=low
+
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:27:39 +0200
+
tryton-proteus (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit b76b133e5a89538eba41945e8d193ec1d7c76857
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:30 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 1ae0776..b918925 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_builddeb:
commit eef0f30eb9e156d082c376527e015abb14e05f0c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:15 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 9477483..79356a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-proteus (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:21:21 +0200
+
tryton-proteus (2.6.1-3) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704409).
commit 56a24af54b885903c304aec7ed5fcc17c9acd28c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:11 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 6d5c31e..1d0f2ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2010-2012 Cédric Krier
- 2010-2012 B2CK SPRL
+Copyright: 2010-2013 Cédric Krier
+ 2010-2013 B2CK SPRL
License: LGPL-3+
Files: debian/*
commit 014a664a74b59ed36d2ab050a428e955919b7238
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:38:34 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index c9af7ca..628c5ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 2.6.1 - 2012-11-05
+Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
+* Add support of fields.Dict
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index e792a2c..7e8c156 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
diff --git a/PKG-INFO b/PKG-INFO
index d817b42..528d96a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: proteus
-Version: 2.6.1
+Version: 2.8.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: proteus
=======
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index d817b42..528d96a 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: proteus
-Version: 2.6.1
+Version: 2.8.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: proteus
=======
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index 4c333d6..d9c9147 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -4,7 +4,7 @@ python-dateutil
cdecimal
[trytond]
-trytond >= 2.6, < 2.7
+trytond >= 2.8, < 2.9
[simplejson]
simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index f2ec0cd..257d1c9 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.8.0"
__all__ = ['Model', 'Wizard']
import sys
try:
@@ -186,6 +186,12 @@ class TimeDescriptor(FieldDescriptor):
super(TimeDescriptor, self).__set__(instance, value)
+class DictDescriptor(FieldDescriptor):
+ def __set__(self, instance, value):
+ assert isinstance(value, dict) or value in (None, False)
+ super(DictDescriptor, self).__set__(instance, value)
+
+
class Many2OneDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
relation = Model.get(self.definition['relation'], instance._config)
@@ -268,6 +274,7 @@ class One2ManyValueDescriptor(ValueDescriptor):
def __get__(self, instance, owner):
value = [('add', [])]
value_list = getattr(instance, self.name)
+ to_create = []
for record in value_list:
if record.id > 0:
if record._changed:
@@ -275,7 +282,9 @@ class One2ManyValueDescriptor(ValueDescriptor):
fields=record._changed)))
value[0][1].append(record.id)
else:
- value.append(('create', record._get_values()))
+ to_create.append(record._get_values())
+ if to_create:
+ value.append(('create', to_create))
if value_list.record_removed:
value.append(('unlink', [x.id for x in value_list.record_removed]))
if value_list.record_deleted:
@@ -343,6 +352,7 @@ class MetaModelFactory(object):
'date': DateDescriptor,
'datetime': DateTimeDescriptor,
'time': TimeDescriptor,
+ 'dict': DictDescriptor,
'many2one': Many2OneDescriptor,
'one2many': One2ManyDescriptor,
'many2many': Many2ManyDescriptor,
@@ -586,6 +596,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
@@ -646,7 +659,7 @@ class Model(object):
context = self._config.context
if self.id < 0:
values = self._get_values()
- self.__id = self._proxy.create(values, context)
+ self.__id, = self._proxy.create([values], context)
else:
if not self._changed:
return
@@ -753,7 +766,7 @@ class Model(object):
values = self._get_on_change_value()
if self._parent:
values['_parent_%s' % self._parent_name] = \
- _EvalEnvironment(self._parent)
+ _EvalEnvironment(self._parent)
for arg in args:
scope = values
for i in arg.split('.'):
@@ -879,7 +892,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:
diff --git a/proteus/pyson.py b/proteus/pyson.py
index 830c057..462fce9 100644
--- a/proteus/pyson.py
+++ b/proteus/pyson.py
@@ -187,10 +187,10 @@ class And(PYSON):
for statement in statements:
if isinstance(statement, PYSON):
assert statement.types() == set([bool]), \
- 'statement must be boolean'
+ 'statement must be boolean'
else:
assert isinstance(statement, bool), \
- 'statement must be boolean'
+ 'statement must be boolean'
assert len(statements) >= 2, 'must have at least 2 statements'
self._statements = list(statements)
@@ -258,10 +258,10 @@ class Greater(PYSON):
for i in (statement1, statement2):
if isinstance(i, PYSON):
assert i.types().issubset(set([int, long, float])), \
- 'statement must be an integer or a float'
+ 'statement must be an integer or a float'
else:
assert isinstance(i, (int, long, float)), \
- 'statement must be an integer or a float'
+ 'statement must be an integer or a float'
if isinstance(equal, PYSON):
assert equal.types() == set([bool])
else:
@@ -319,10 +319,10 @@ class If(PYSON):
then_types = set([type(then_statement)])
if isinstance(else_statement, PYSON):
assert then_types == else_statement.types(), \
- 'then and else statements must be the same type'
+ 'then and else statements must be the same type'
else:
assert then_types == set([type(else_statement)]), \
- 'then and else statements must be the same type'
+ 'then and else statements must be the same type'
self._condition = condition
self._then_statement = then_statement
self._else_statement = else_statement
@@ -390,13 +390,13 @@ class In(PYSON):
super(In, self).__init__()
if isinstance(key, PYSON):
assert key.types().issubset(set([str, int, long])), \
- 'key must be a string or an integer or a long'
+ 'key must be a string or an integer or a long'
else:
assert type(key) in [str, int, long], \
- 'key must be a string or an integer or a long'
+ 'key must be a string or an integer or a long'
if isinstance(obj, PYSON):
assert obj.types().issubset(set([dict, list])), \
- 'obj must be a dict or a list'
+ 'obj must be a dict or a list'
if obj.types() == set([dict]):
assert type(key) == str, 'key must be a string'
else:
@@ -429,10 +429,10 @@ class Date(PYSON):
for i in (year, month, day, delta_years, delta_months, delta_days):
if isinstance(i, PYSON):
assert i.types().issubset(set([int, long, type(None)])), \
- '%s must be an integer or None' % (i,)
+ '%s must be an integer or None' % (i,)
else:
assert isinstance(i, (int, long, type(None))), \
- '%s must be an integer or None' % (i,)
+ '%s must be an integer or None' % (i,)
self._year = year
self._month = month
self._day = day
@@ -480,10 +480,10 @@ class DateTime(Date):
delta_hours, delta_minutes, delta_seconds, delta_microseconds):
if isinstance(i, PYSON):
assert i.types() == set([int, long, type(None)]), \
- '%s must be an integer or None' % (i,)
+ '%s must be an integer or None' % (i,)
else:
assert isinstance(i, (int, long, type(None))), \
- '%s must be an integer or None' % (i,)
+ '%s must be an integer or None' % (i,)
self._hour = hour
self._minute = minute
self._second = second
diff --git a/setup.py b/setup.py
index 430027a..b63c3bb 100644
--- a/setup.py
+++ b/setup.py
@@ -17,11 +17,10 @@ setup(name='proteus',
version=proteus.__version__,
description='Library to access Tryton server as a client',
long_description=read('README'),
- author='B2CK',
- author_email='info at b2ck.com',
+ author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- proteus.__version__.rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ proteus.__version__.rsplit('.', 1)[0] + '/'),
packages=find_packages(),
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -30,12 +29,13 @@ setup(name='proteus',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+ 'License :: OSI Approved :: '
+ 'GNU Library or Lesser General Public License (LGPL)',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='LGPL-3',
install_requires=[
"python-dateutil",
@@ -45,8 +45,8 @@ setup(name='proteus',
(major_version, minor_version, major_version, minor_version + 1)],
'simplejson': ['simplejson'],
'cdecimal': ['cdecimal'],
- },
+ },
test_suite='proteus.tests',
tests_require=('trytond >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1))
-)
+ )
commit 833584e2294e2da0e5e2a2e0ebaf9c680bf769ae
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:58 2013 +0200
Releasing debian version 2.6.1-3.
diff --git a/debian/changelog b/debian/changelog
index 677c74a..9477483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-proteus (2.6.1-3) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704409).
+ * Adding README.Debian to point out version dependency.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:25:57 +0200
+
tryton-proteus (2.6.1-2) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 13eb6ceeefccccf8ffc2923f4c38f5fa44598d61
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 12:39:31 2013 +0200
Adding README.Debian to point out version dependency.
diff --git a/debian/tryton-proteus.README.Debian b/debian/tryton-proteus.README.Debian
new file mode 100644
index 0000000..d173d13
--- /dev/null
+++ b/debian/tryton-proteus.README.Debian
@@ -0,0 +1,7 @@
+tryton-proteus for Debian
+--------------------------
+
+Note: The Tryton client library proteus can only connect to Tryton servers
+with the same major version (e.g. the first two numbers of the version string).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 12:00:00 +0200
commit fcd786f226c1ab2e6e210830ef289fadbd55a52a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:41:56 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704409).
diff --git a/debian/control b/debian/control
index 68bdf6e..889a182 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-proteus
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends:
debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
Standards-Version: 3.9.4
commit b16704a0427f6f09a63565a9268e4391afceeb7d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:21 2013 +0100
Releasing debian version 2.6.1-2.
diff --git a/debian/changelog b/debian/changelog
index 63c12f4..677c74a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-proteus (2.6.1-2) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:01:35 +0100
+
tryton-proteus (2.6.1-1) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 7affb7ec745602c1b50ba559f735ea00e9efc84c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:33 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a0762c7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*proteus-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit efb0d8ec277c4474eb8069d597bfd812c85f8a59
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:13 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 0d9d766..68bdf6e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-proteus.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-proteus.git
X-Python-Version: >= 2.6
Package: tryton-proteus
commit 02508340455d85a486498da62eaf506c32f19f0f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:52 2013 +0100
Releasing debian version 2.6.1-1.
diff --git a/debian/changelog b/debian/changelog
index 77cd84b..63c12f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-proteus (2.6.1-1) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Merging upstream version 2.6.1.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:44:45 +0100
+
tryton-proteus (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit 3d1f1a53c09f5c4474330776041788cb0cf5bd62
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:21 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 92cfa0b..6d5c31e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2010-2012 Cedric Krier
+Copyright: 2010-2012 Cédric Krier
2010-2012 B2CK SPRL
License: LGPL-3+
Files: debian/*
-Copyright: 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2011-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: LGPL-3+
commit 466a1e72411fdcec3b4218493fd600dfa7af1c5b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 20:51:00 2013 +0100
Merging upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3a1a79d..c9af7ca 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)
diff --git a/PKG-INFO b/PKG-INFO
index be259fb..d817b42 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: proteus
-Version: 2.6.0
+Version: 2.6.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index be259fb..d817b42 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: proteus
-Version: 2.6.0
+Version: 2.6.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 2484c01..f2ec0cd 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:
diff --git a/proteus/config.py b/proteus/config.py
index 5ff579f..436ce8e 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)
commit a83491280cf6503afadadddb8fb96b994d21376a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:39 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 4e1d462..0d9d766 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends:
debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-proteus.git
commit 6496d3393e6036befdb41c13de1a17660e1ec28b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index a598f94..4e1d462 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends:
debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
Standards-Version: 3.9.3
commit cf216ed9be8e7602f1a872dffa1c38ca3e5b79a5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:02:19 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 6969aa3..77cd84b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:25:26 +0200
+
tryton-proteus (2.4.1-2) experimental; urgency=low
[ Daniel Baumann ]
commit def0854e6f34a88ec00198ec27c90ddb24e35dcc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:54:05 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index db02c9c..3a1a79d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.4.1 - 2012-09-10
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-23
diff --git a/PKG-INFO b/PKG-INFO
index 2f44fe4..be259fb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.4.1
+Version: 2.6.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.4/
+Download-URL: http://downloads.tryton.org/2.6/
Description: proteus
=======
@@ -84,9 +84,7 @@ Description: proteus
Addresses are store on party with a `One2Many` field. So the new address just
needs to be appended to the list `addresses`.
- >>> Address = Model.get('party.address')
- >>> address = Address()
- >>> party.addresses.append(address)
+ >>> address = party.addresses.new()
>>> party.save()
>>> party.addresses #doctest: +ELLIPSIS
[proteus.Model.get('party.address')(...)]
@@ -139,6 +137,7 @@ Description: proteus
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
diff --git a/README b/README
index 390ee65..aa9f9a7 100644
--- a/README
+++ b/README
@@ -75,9 +75,7 @@ Creating an address for the party
Addresses are store on party with a `One2Many` field. So the new address just
needs to be appended to the list `addresses`.
- >>> Address = Model.get('party.address')
- >>> address = Address()
- >>> party.addresses.append(address)
+ >>> address = party.addresses.new()
>>> party.save()
>>> party.addresses #doctest: +ELLIPSIS
[proteus.Model.get('party.address')(...)]
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 2f44fe4..be259fb 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.4.1
+Version: 2.6.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.4/
+Download-URL: http://downloads.tryton.org/2.6/
Description: proteus
=======
@@ -84,9 +84,7 @@ Description: proteus
Addresses are store on party with a `One2Many` field. So the new address just
needs to be appended to the list `addresses`.
- >>> Address = Model.get('party.address')
- >>> address = Address()
- >>> party.addresses.append(address)
+ >>> address = party.addresses.new()
>>> party.save()
>>> party.addresses #doctest: +ELLIPSIS
[proteus.Model.get('party.address')(...)]
@@ -139,6 +137,7 @@ Description: proteus
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
diff --git a/proteus.egg-info/SOURCES.txt b/proteus.egg-info/SOURCES.txt
index c415452..9ca43b4 100644
--- a/proteus.egg-info/SOURCES.txt
+++ b/proteus.egg-info/SOURCES.txt
@@ -15,5 +15,6 @@ proteus.egg-info/requires.txt
proteus.egg-info/top_level.txt
proteus/tests/__init__.py
proteus/tests/test_config.py
+proteus/tests/test_context.py
proteus/tests/test_model.py
proteus/tests/test_wizard.py
\ No newline at end of file
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index f0b6a22..4c333d6 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -4,7 +4,7 @@ python-dateutil
cdecimal
[trytond]
-trytond >= 2.4, < 2.5
+trytond >= 2.6, < 2.7
[simplejson]
simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index cdaf8c6..2484c01 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.4.1"
+__version__ = "2.6.0"
__all__ = ['Model', 'Wizard']
import sys
try:
@@ -100,6 +100,12 @@ class CharDescriptor(FieldDescriptor):
assert isinstance(value, basestring) or value in (None, False)
super(CharDescriptor, self).__set__(instance, value or '')
+ def __get__(self, instance, owner):
+ value = super(CharDescriptor, self).__get__(instance, owner)
+ if value is False:
+ value = None
+ return value
+
class BinaryDescriptor(FieldDescriptor):
default = None
@@ -208,12 +214,17 @@ class One2ManyDescriptor(FieldDescriptor):
default = []
def __get__(self, instance, owner):
+ from .pyson import PYSONDecoder
relation = Model.get(self.definition['relation'], instance._config)
value = super(One2ManyDescriptor, self).__get__(instance, owner)
if not isinstance(value, ModelList):
- value = ModelList((relation(id)
- for id in value or []), instance, self.name,
- self.definition.get('relation_field'))
+ ctx = instance._context.copy() if instance._context else {}
+ if self.definition.get('context'):
+ decoder = PYSONDecoder(_EvalEnvironment(instance))
+ ctx.update(decoder.decode(self.definition.get('context')))
+ with instance._config.set_context(ctx):
+ value = ModelList(self.definition, (relation(id)
+ for id in value or []), instance, self.name)
instance._values[self.name] = value
return value
@@ -240,13 +251,13 @@ class ReferenceValueDescriptor(ValueDescriptor):
value = super(ReferenceValueDescriptor, self).__get__(instance, owner)
if isinstance(value, Model):
value = '%s,%s' % (value.__class__.__name__, value.id)
- return value or False
+ return value or None
class Many2OneValueDescriptor(ValueDescriptor):
def __get__(self, instance, owner):
value = super(Many2OneValueDescriptor, self).__get__(instance, owner)
- return value and value.id or False
+ return value and value.id or None
class One2OneValueDescriptor(Many2OneValueDescriptor):
@@ -260,7 +271,7 @@ class One2ManyValueDescriptor(ValueDescriptor):
for record in value_list:
if record.id > 0:
if record._changed:
- value.append(('write', record.id, record._get_values(
+ value.append(('write', [record.id], record._get_values(
fields=record._changed)))
value[0][1].append(record.id)
else:
@@ -291,7 +302,7 @@ class ReferenceEvalDescriptor(EvalDescriptor):
value = super(ReferenceEvalDescriptor, self).__get__(instance, owner)
if isinstance(value, Model):
value = '%s,%s' % (value.__class__.__name__, value.id)
- return value or False
+ return value or None
class Many2OneEvalDescriptor(EvalDescriptor):
@@ -299,7 +310,7 @@ class Many2OneEvalDescriptor(EvalDescriptor):
value = super(Many2OneEvalDescriptor, self).__get__(instance, owner)
if value:
return value.id
- return False
+ return None
class One2OneEvalDescriptor(Many2OneEvalDescriptor):
@@ -398,22 +409,26 @@ class MetaModelFactory(object):
class ModelList(list):
'List for Model'
- def __init__(self, sequence=None, parent=None, parent_field_name='',
- parent_name=''):
+ def __init__(self, definition, sequence=None, parent=None,
+ parent_field_name=''):
+ self.model_name = definition['relation']
if sequence is None:
sequence = []
self.parent = parent
if parent:
assert parent_field_name
self.parent_field_name = parent_field_name
- self.parent_name = parent_name
+ self.parent_name = definition.get('relation_field', '')
+ self.domain = definition.get('domain', [])
+ self.context = definition.get('context')
+ self.add_remove = definition.get('add_remove')
self.record_removed = set()
self.record_deleted = set()
result = super(ModelList, self).__init__(sequence)
for record in self:
record._parent = parent
record._parent_field_name = parent_field_name
- record._parent_name = parent_name
+ record._parent_name = self.parent_name
return result
__init__.__doc__ = list.__init__.__doc__
@@ -423,6 +438,13 @@ class ModelList(list):
self.parent._changed.add(self.parent_field_name)
self.parent._on_change(self.parent_field_name)
+ def _get_context(self):
+ from .pyson import PYSONDecoder
+ decoder = PYSONDecoder(_EvalEnvironment(self.parent))
+ ctx = self.parent._context.copy() if self.parent._context else {}
+ ctx.update(decoder.decode(self.context) if self.context else {})
+ return ctx
+
def append(self, record):
assert isinstance(record, Model)
if self.parent:
@@ -497,6 +519,28 @@ class ModelList(list):
raise NotImplementedError
sort.__doc__ = list.sort.__doc__
+ def new(self):
+ 'Adds a new record to the ModelList and returns it'
+ Relation = Model.get(self.model_name, self.parent._config)
+ with Relation._config.set_context(self._get_context()):
+ new_record = Relation()
+ self.append(new_record)
+ return new_record
+
+ def find(self, condition=None, offset=0, limit=None, order=None):
+ 'Returns records matching condition taking into account list domain'
+ from .pyson import PYSONDecoder
+ decoder = PYSONDecoder(_EvalEnvironment(self.parent))
+ Relation = Model.get(self.model_name, self.parent._config)
+ if condition is None:
+ condition = []
+ field_domain = decoder.decode(self.domain)
+ add_remove_domain = (decoder.decode(self.add_remove)
+ if self.add_remove else [])
+ new_domain = [field_domain, add_remove_domain, condition]
+ with Relation._config.set_context(self._get_context()):
+ return Relation.find(new_domain, offset, limit, order)
+
class Model(object):
'Model class for Tryton records'
@@ -518,6 +562,7 @@ class Model(object):
self._parent = None # store the parent record
self._parent_field_name = '' # store the field name in parent record
self._parent_name = '' # store the field name to parent record
+ self._context = self._config.context # store the context
if self.id < 0 and _default:
self._default_get()
@@ -607,7 +652,7 @@ class Model(object):
return
values = self._get_values(fields=self._changed)
context['_timestamp'] = self._get_timestamp()
- self._proxy.write(self.id, values, context)
+ self._proxy.write([self.id], values, context)
self.reload()
def delete(self):
@@ -615,7 +660,7 @@ class Model(object):
if self.id > 0:
context = self._config.context
context['_timestamp'] = self._get_timestamp()
- return self._proxy.delete(self.id, context)
+ return self._proxy.delete([self.id], context)
self.reload()
return True
@@ -654,8 +699,8 @@ class Model(object):
if y['loading'] == 'eager']
if not self._fields:
fields.append('_timestamp')
- self._values.update(self._proxy.read(self.id, fields,
- self._config.context))
+ self._values.update(self._proxy.read([self.id], fields,
+ self._config.context)[0])
for field in fields:
if (field in self._fields
and self._fields[field]['type'] == 'float'
@@ -684,8 +729,8 @@ class Model(object):
record = relation()
record._default_set(vals)
records.append(record)
- self._values[field] = ModelList(records, self, field,
- definition.get('relation_field', ''))
+ self._values[field] = ModelList(definition, records, self,
+ field)
else:
self._values[field] = value
@@ -697,10 +742,10 @@ class Model(object):
def _get_on_change_value(self):
values = self._get_eval()
- del values['id']
for field, definition in self._fields.iteritems():
- if definition['type'] in ('one2many', 'many2many'):
- values[field] = [x._get_eval() for x in getattr(self, field)]
+ if definition['type'] == 'one2many':
+ values[field] = [x._get_on_change_value()
+ for x in getattr(self, field)]
return values
def _on_change_args(self, args):
@@ -795,8 +840,8 @@ class Model(object):
values.update(self._on_change_args(definition['on_change_with']))
if to_change:
context = self._config.context
- result = getattr(self._proxy, 'on_change_with')(list(to_change),
- values, context)
+ result = getattr(self._proxy, 'on_change_with')(values,
+ list(to_change), context)
for field, value in result.items():
self._on_change_set(field, value)
for field in later:
@@ -847,7 +892,11 @@ class Wizard(object):
ctx['active_model'] = None
if self.form:
- data = {self.form_state: self.form._get_on_change_value()}
+ # Filter only modified values
+ data = {self.form_state:
+ dict((k, v) for k, v in
+ self.form._get_on_change_value().iteritems()
+ if k in self.form._values)}
else:
data = {}
diff --git a/proteus/config.py b/proteus/config.py
index ef02ba2..5ff579f 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -72,6 +72,20 @@ _CONFIG = threading.local()
_CONFIG.current = None
+class ContextManager(object):
+ 'Context Manager for the tryton context'
+
+ def __init__(self, config):
+ self.config = config
+ self.context = config.context
+
+ def __enter__(self):
+ return self
+
+ def __exit__(self, exc_type, exc_value, traceback):
+ self.config._context = self.context
+
+
class Config(object):
'Config interface'
@@ -83,6 +97,16 @@ class Config(object):
def context(self):
return self._context.copy()
+ def set_context(self, context=None, **kwargs):
+ ctx_manager = ContextManager(self)
+
+ if context is None:
+ context = None
+ self._context = self.context
+ self._context.update(context)
+ self._context.update(kwargs)
+ return ctx_manager
+
def get_proxy(self, name):
raise NotImplementedError
@@ -101,28 +125,35 @@ class _TrytondMethod(object):
def __call__(self, *args):
from trytond.cache import Cache
from trytond.transaction import Transaction
+ from trytond.rpc import RPC
- if self._name in self._object._rpc:
- readonly = not self._object._rpc[self._name]
+ if self._name in self._object.__rpc__:
+ rpc = self._object.__rpc__[self._name]
elif self._name in getattr(self._object, '_buttons', {}):
- readonly = False
+ rpc = RPC(readonly=False, instantiate=0)
else:
raise TypeError('%s is not callable' % self._name)
with Transaction().start(self._config.database_name,
- self._config.user, readonly=readonly) as transaction:
+ self._config.user, readonly=rpc.readonly) as transaction:
Cache.clean(self._config.database_name)
- args = list(args)
- context = args.pop()
- if '_timestamp' in context:
- transaction.timestamp = context['_timestamp']
- del context['_timestamp']
- transaction.context = context
- res = getattr(self._object, self._name)(*args)
- if not readonly:
+ args, kwargs, transaction.context, transaction.timestamp = \
+ rpc.convert(self._object, *args)
+ meth = getattr(self._object, self._name)
+ if not hasattr(meth, 'im_self') or meth.im_self:
+ result = rpc.result(meth(*args, **kwargs))
+ else:
+ assert rpc.instantiate == 0
+ inst = args.pop(0)
+ if hasattr(inst, self._name):
+ result = rpc.result(meth(inst, *args, **kwargs))
+ else:
+ result = [rpc.result(meth(i, *args, **kwargs))
+ for i in inst]
+ if not rpc.readonly:
transaction.cursor.commit()
Cache.resets(self._config.database_name)
- return res
+ return result
class TrytondProxy(object):
@@ -149,7 +180,6 @@ class TrytondConfig(Config):
CONFIG.update_etc(config_file)
if database_type is not None:
CONFIG['db_type'] = database_type
- from trytond.modules import register_classes
from trytond.pool import Pool
from trytond.backend import Database
from trytond.protocols.dispatcher import create
@@ -165,7 +195,7 @@ class TrytondConfig(Config):
self._user = user
self.config_file = config_file
- register_classes()
+ Pool.start()
database = Database().connect()
cursor = database.cursor()
@@ -183,13 +213,13 @@ class TrytondConfig(Config):
with Transaction().start(self.database_name, 0) as transaction:
Cache.clean(database_name)
- user_obj = self.pool.get('res.user')
+ User = self.pool.get('res.user')
transaction.context = self.context
- self.user = user_obj.search([
+ self.user = User.search([
('login', '=', user),
- ], limit=1)[0]
+ ], limit=1)[0].id
with transaction.set_user(self.user):
- self._context = user_obj.get_preferences(context_only=True)
+ self._context = User.get_preferences(context_only=True)
Cache.resets(database_name)
__init__.__doc__ = object.__init__.__doc__
@@ -219,7 +249,7 @@ class TrytondConfig(Config):
def get_proxy_methods(self, name, type='model'):
'Return list of methods'
proxy = self.get_proxy(name, type=type)
- methods = [x for x in proxy._object._rpc]
+ methods = [x for x in proxy._object.__rpc__]
if hasattr(proxy._object, '_buttons'):
methods += [x for x in proxy._object._buttons]
return methods
diff --git a/proteus/tests/test_context.py b/proteus/tests/test_context.py
new file mode 100644
index 0000000..dc7faea
--- /dev/null
+++ b/proteus/tests/test_context.py
@@ -0,0 +1,21 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of this
+# repository contains the full copyright notices and license terms.
+
+from unittest import TestCase
+from proteus import config
+
+
+class TestContext(TestCase):
+
+ def setUp(self):
+ self.config = config.set_trytond(database_type='sqlite')
+
+ def test_config(self):
+ prev_ctx = self.config._context
+
+ with self.config.set_context({'a': 1}):
+ self.assertEqual(self.config.context['a'], 1)
+ for key, value in prev_ctx.items():
+ self.assertEqual(self.config.context[key], value)
+
+ self.assertEqual(self.config.context, prev_ctx)
diff --git a/proteus/tests/test_model.py b/proteus/tests/test_model.py
index db6243c..f4b90d7 100644
--- a/proteus/tests/test_model.py
+++ b/proteus/tests/test_model.py
@@ -276,7 +276,7 @@ class TestModel(TestCase):
test.name = 'Test delete'
test.login = 'test delete'
test.save()
- self.assert_(test.delete())
+ test.delete()
def test_on_change(self):
Trigger = Model.get('ir.trigger')
diff --git a/setup.py b/setup.py
index 1799c38..430027a 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(name='proteus',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
commit 9652c660fb8a6b01af28da3a37e7b18b7105142c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:27 2012 +0200
Releasing debian version 2.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index 996b012..6969aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tryton-proteus (2.4.1-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+ * Correcting copyright file to match format version 1.0.
+
+ [ Mathias Behrle ]
+ * Adding python-dateutil to Build-Depends and Depends.
+ * Merging branch debian-wheezy-2.2 (Closes: #687745).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 17 Sep 2012 12:31:15 +0200
+
tryton-proteus (2.4.1-1) experimental; urgency=low
* Merging upstream version 2.4.1.
commit 2106386cb6518ee0323e4d7861bab52946b46a9a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Sep 17 12:30:39 2012 +0200
Adding python-dateutil to Build-Depends and Depends.
diff --git a/debian/control b/debian/control
index a27c09d..a598f94 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
@@ -14,8 +15,8 @@ X-Python-Version: >= 2.6
Package: tryton-proteus
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, python-dateutil, python-pkg-resources
-Recommends: python-simplejson
+ ${misc:Depends}, ${python:Depends}, python-dateutil, python-simplejson,
+ python-pkg-resources
Suggests: tryton-server
Description: Tryton Application Platform (Proteus)
Tryton is a high-level general purpose application platform written in Python
commit ec7edc99697855d5405ea6fbbf9cabb3e1cfe61e
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 17:09:54 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 3ba7c9a..92cfa0b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- (C) 2010-2012 Cedric Krier
- (C) 2010-2012 B2CK SPRL
+Copyright: 2010-2012 Cedric Krier
+ 2010-2012 B2CK SPRL
License: LGPL-3+
Files: debian/*
-Copyright: (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: LGPL-3+
commit d290ab0289c88105b86d23873385dcc0520fe965
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 17:09:54 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 99aebbc..a27c09d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
commit 11b332b3e74a7cbafcecca5e14c9f308f6d39717
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 17:09:54 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit d0537def5fe16456ea303e73e3819f0ab52dd4bf
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:07 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index b91eeac..99aebbc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-proteus.git
X-Python-Version: >= 2.6
Package: tryton-proteus
commit 2c0a84707fda5f3cf56557fc197bb9c5df1d4451
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:47:48 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 535a45a..b91eeac 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-proteus
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 632bc8b366c3a51c1ac70c2e52208109a17d59f7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 14:27:45 2012 +0200
Releasing debian version 2.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index 3ed4224..996b012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-proteus (2.4.1-1) experimental; urgency=low
+
+ * Merging upstream version 2.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Sep 2012 13:20:01 +0200
+
tryton-proteus (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit c065301b977e738ab3cf623d7953b6fe7f41c217
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:16:53 2012 +0200
Merging upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index c628e1f..db02c9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-09-10
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
* Use loading attribute
diff --git a/PKG-INFO b/PKG-INFO
index 129be62..2f44fe4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.4.0
+Version: 2.4.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
@@ -40,8 +40,8 @@ Description: proteus
>>> Module = Model.get('ir.module.module')
>>> (party,) = Module.find([('name', '=', 'party')])
- >>> Module.button_install([party.id], config.context)
- >>> Wizard('ir.module.module.install_upgrade').execute('start')
+ >>> Module.install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
Creating a party
~~~~~~~~~~~~~~~~
diff --git a/README b/README
index 7e0a957..390ee65 100644
--- a/README
+++ b/README
@@ -31,8 +31,8 @@ Find the module, call the install button and run the install wizard.
>>> Module = Model.get('ir.module.module')
>>> (party,) = Module.find([('name', '=', 'party')])
- >>> Module.button_install([party.id], config.context)
- >>> Wizard('ir.module.module.install_upgrade').execute('start')
+ >>> Module.install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
Creating a party
~~~~~~~~~~~~~~~~
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 129be62..2f44fe4 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.4.0
+Version: 2.4.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
@@ -40,8 +40,8 @@ Description: proteus
>>> Module = Model.get('ir.module.module')
>>> (party,) = Module.find([('name', '=', 'party')])
- >>> Module.button_install([party.id], config.context)
- >>> Wizard('ir.module.module.install_upgrade').execute('start')
+ >>> Module.install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
Creating a party
~~~~~~~~~~~~~~~~
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 4c944aa..cdaf8c6 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.4.0"
+__version__ = "2.4.1"
__all__ = ['Model', 'Wizard']
import sys
try:
@@ -20,7 +20,6 @@ from decimal import Decimal
from types import NoneType
import proteus.config
-from proteus.pyson import PYSONDecoder
_MODELS = threading.local()
@@ -189,7 +188,8 @@ class Many2OneDescriptor(FieldDescriptor):
value = relation(value)
elif not value:
value = None
- instance._values[self.name] = value
+ if self.name in instance._values:
+ instance._values[self.name] = value
return value
def __set__(self, instance, value):
@@ -600,7 +600,7 @@ class Model(object):
'Save the record'
context = self._config.context
if self.id < 0:
- values = self._get_values(fields=self._changed)
+ values = self._get_values()
self.__id = self._proxy.create(values, context)
else:
if not self._changed:
@@ -759,6 +759,8 @@ class Model(object):
def _on_change(self, name):
'Call on_change for field'
+ # Import locally to not break installation
+ from proteus.pyson import PYSONDecoder
definition = self._fields[name]
if definition.get('on_change'):
if isinstance(definition['on_change'], basestring):
commit 6a782fa4e59d5c0dcb10457389894a54792d4c24
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:19 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 115f2d0..3ed4224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-proteus (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Updating Depends and Recommends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:33:55 +0200
+
tryton-proteus (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit ff3b621c8a18b8b03259c4f28dd81671e07f5b34
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:34:56 2012 +0200
Updating Depends and Recommends.
diff --git a/debian/control b/debian/control
index 5caba0a..535a45a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-proteus
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, python-simplejson, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, python-dateutil, python-pkg-resources
+Recommends: python-simplejson
Suggests: tryton-server
Description: Tryton Application Platform (Proteus)
Tryton is a high-level general purpose application platform written in Python
commit 14c11349651942cf783174e996eb83d8aaabf8b1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 5b70b16..3ba7c9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2010-2011 Cedric Krier
- (C) 2010-2011 B2CK SPRL
+ (C) 2010-2012 Cedric Krier
+ (C) 2010-2012 B2CK SPRL
License: LGPL-3+
Files: debian/*
commit 5e73938db9fdfa39d2e1d2171c0de7e907edda58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:17 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index ff71820..c628e1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
+* Use loading attribute
+* Add support of _buttons
+* Add support of fields.Time
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index de261a6..e792a2c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2011 Cédric Krier.
-Copyright (C) 2010-2011 B2CK SPRL.
+Copyright (C) 2010-2012 Cédric Krier.
+Copyright (C) 2010-2012 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
diff --git a/INSTALL b/INSTALL
index 4267630..9858055 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
+ * Optional: cdecimal (http://www.bytereef.org/mpdecimal/index.html)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index 5737c16..129be62 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: proteus
-Version: 2.2.1
+Version: 2.4.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: proteus
=======
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 5737c16..129be62 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: proteus
-Version: 2.2.1
+Version: 2.4.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: proteus
=======
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index 747ad85..f0b6a22 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -1,4 +1,10 @@
+python-dateutil
+[cdecimal]
+cdecimal
[trytond]
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond >= 2.4, < 2.5
+
+[simplejson]
+simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index f07cd72..4c944aa 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,17 +3,28 @@
'''
A library to access Tryton's models like a client.
'''
-__version__ = "2.2.1"
+__version__ = "2.4.0"
__all__ = ['Model', 'Wizard']
-from types import NoneType
+import sys
+try:
+ import cdecimal
+ # Use cdecimal globally
+ if 'decimal' not in sys.modules:
+ sys.modules['decimal'] = cdecimal
+except ImportError:
+ import decimal
+ sys.modules['cdecimal'] = decimal
import threading
import datetime
from decimal import Decimal
+from types import NoneType
+
import proteus.config
from proteus.pyson import PYSONDecoder
_MODELS = threading.local()
+
class _EvalEnvironment(dict):
'Dictionary for evaluation'
def __init__(self, parent):
@@ -58,12 +69,12 @@ class FieldDescriptor(object):
self.__doc__ = definition['string']
def __get__(self, instance, owner):
- if instance.id > 0 and self.name not in instance._values:
+ if instance.id > 0:
instance._read(self.name)
return instance._values.get(self.name, self.default)
def __set__(self, instance, value):
- if instance.id > 0 and self.name not in instance._values:
+ if instance.id > 0:
instance._read(self.name)
previous = getattr(instance, self.name)
instance._values[self.name] = value
@@ -95,30 +106,31 @@ class BinaryDescriptor(FieldDescriptor):
default = None
def __set__(self, instance, value):
- assert isinstance(value, (basestring, buffer)) or value in (None, False)
+ assert (isinstance(value, (basestring, buffer))
+ or value in (None, False))
super(BinaryDescriptor, self).__set__(instance, value or '')
class IntegerDescriptor(FieldDescriptor):
- default = 0
def __set__(self, instance, value):
- assert isinstance(value, (int, long))
+ assert isinstance(value, (int, long, NoneType))
super(IntegerDescriptor, self).__set__(instance, value)
class FloatDescriptor(FieldDescriptor):
- default = 0.0
def __set__(self, instance, value):
- super(FloatDescriptor, self).__set__(instance, float(value))
+ assert isinstance(value, (int, long, float, Decimal, NoneType))
+ if value is not None:
+ value = float(value)
+ super(FloatDescriptor, self).__set__(instance, value)
class NumericDescriptor(FieldDescriptor):
- default = Decimal('0.0')
def __set__(self, instance, value):
- assert isinstance(value, Decimal)
+ assert isinstance(value, (NoneType, Decimal))
# TODO add digits validation
super(NumericDescriptor, self).__set__(instance, value)
@@ -163,6 +175,12 @@ class DateTimeDescriptor(FieldDescriptor):
super(DateTimeDescriptor, self).__set__(instance, value)
+class TimeDescriptor(FieldDescriptor):
+ def __set__(self, instance, value):
+ assert isinstance(value, datetime.time) or value in (None, False)
+ super(TimeDescriptor, self).__set__(instance, value)
+
+
class Many2OneDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
relation = Model.get(self.definition['relation'], instance._config)
@@ -304,7 +322,7 @@ class MetaModelFactory(object):
'text': CharDescriptor,
'sha': CharDescriptor,
'binary': BinaryDescriptor,
- 'selection': CharDescriptor, # TODO implement its own descriptor
+ 'selection': CharDescriptor, # TODO implement its own descriptor
'integer': IntegerDescriptor,
'biginteger': IntegerDescriptor,
'float': FloatDescriptor,
@@ -313,6 +331,7 @@ class MetaModelFactory(object):
'reference': ReferenceDescriptor,
'date': DateDescriptor,
'datetime': DateTimeDescriptor,
+ 'time': TimeDescriptor,
'many2one': Many2OneDescriptor,
'one2many': One2ManyDescriptor,
'many2many': Many2ManyDescriptor,
@@ -342,6 +361,7 @@ class MetaModelFactory(object):
models_key = 'c%s' % id(self.config)
if not hasattr(_MODELS, models_key):
setattr(_MODELS, models_key, {})
+
class MetaModel(type):
'Meta class for Model'
def __new__(mcs, name, bases, dict):
@@ -486,19 +506,19 @@ class Model(object):
_config = None
_fields = None
- def __init__(self, id=None, **kwargs):
+ def __init__(self, id=None, _default=True, **kwargs):
super(Model, self).__init__()
if id:
assert not kwargs
self.__id = id or Model.__counter
if self.__id < 0:
Model.__counter -= 1
- self._values = {} # store the values of fields
- self._changed = set() # store the changed fields
- self._parent = None # store the parent record
- self._parent_field_name = '' # store the field name in parent record
- self._parent_name = '' # store the field name to parent record
- if self.id < 0:
+ self._values = {} # store the values of fields
+ self._changed = set() # store the changed fields
+ self._parent = None # store the parent record
+ self._parent_field_name = '' # store the field name in parent record
+ self._parent_name = '' # store the field name to parent record
+ if self.id < 0 and _default:
self._default_get()
for field_name, value in kwargs.iteritems():
@@ -625,12 +645,15 @@ class Model(object):
def _read(self, name):
'Read field'
- fields = []
- if not self._values:
+ fields = [name]
+ if name in self._values:
+ return
+ loading = self._fields[name]['loading']
+ if loading == 'eager':
fields = [x for x, y in self._fields.iteritems()
- if y['type'] not in ('one2many', 'many2many', 'binary')]
+ if y['loading'] == 'eager']
+ if not self._fields:
fields.append('_timestamp')
- fields.append(name)
self._values.update(self._proxy.read(self.id, fields,
self._config.context))
for field in fields:
@@ -648,6 +671,8 @@ class Model(object):
def _default_set(self, values):
for field, value in values.iteritems():
+ if '.' in field:
+ continue
definition = self._fields[field]
if definition['type'] in ('one2many', 'many2many'):
if value and len(value) and isinstance(value[0], (int, long)):
@@ -670,13 +695,17 @@ class Model(object):
values['id'] = self.id
return values
- def _on_change_args(self, args):
- res = {}
+ def _get_on_change_value(self):
values = self._get_eval()
del values['id']
for field, definition in self._fields.iteritems():
if definition['type'] in ('one2many', 'many2many'):
values[field] = [x._get_eval() for x in getattr(self, field)]
+ return values
+
+ def _on_change_args(self, args):
+ res = {}
+ values = self._get_on_change_value()
if self._parent:
values['_parent_%s' % self._parent_name] = \
_EvalEnvironment(self._parent)
@@ -691,11 +720,8 @@ class Model(object):
return res
def _on_change_set(self, field, value):
- if self._fields[field]['type'] in ('one2many', 'many2many'):
- if isinstance(value, (list, tuple)):
- self._values[field] = value
- self._changed.add(field)
- return
+ if (self._fields[field]['type'] in ('one2many', 'many2many')
+ and not isinstance(value, (list, tuple))):
to_remove = []
if value and value.get('remove'):
for record_id in value['remove']:
@@ -709,8 +735,10 @@ class Model(object):
for vals in value.get('add', []):
relation = Model.get(self._fields[field]['relation'],
self._config)
- record = relation()
+ record = relation(_default=False)
for i, j in vals.iteritems():
+ if '.' in i:
+ continue
record._values[i] = j
record._changed.add(i)
# append without signal
@@ -721,11 +749,13 @@ class Model(object):
for record in getattr(self, field):
if record.id == vals['id']:
for i, j in vals.iteritems():
+ if '.' in i:
+ continue
record._values[i] = j
record._changed.add(i)
else:
self._values[field] = value
- self._changed.add(field)
+ self._changed.add(field)
def _on_change(self, name):
'Call on_change for field'
@@ -747,6 +777,9 @@ class Model(object):
self._on_change_set(field, value)
for field, value in later.iteritems():
self._on_change_set(field, value)
+ values = {}
+ to_change = set()
+ later = set()
for field, definition in self._fields.iteritems():
if not definition.get('on_change_with'):
continue
@@ -754,11 +787,23 @@ class Model(object):
continue
if field == name:
continue
- args = self._on_change_args(definition['on_change_with'])
+ if to_change & set(definition['on_change_with']):
+ later.add(field)
+ to_change.add(field)
+ values.update(self._on_change_args(definition['on_change_with']))
+ if to_change:
+ context = self._config.context
+ result = getattr(self._proxy, 'on_change_with')(list(to_change),
+ values, context)
+ for field, value in result.items():
+ self._on_change_set(field, value)
+ for field in later:
+ definition = self._fields[field]
+ values = self._on_change_args(definition['on_change_with'])
context = self._config.context
- res = getattr(self._proxy, 'on_change_with_%s' % field)(args,
+ result = getattr(self._proxy, 'on_change_with_%s' % field)(values,
context)
- self._on_change_set(field, res)
+ self._on_change_set(field, result)
if self._parent:
self._parent._changed.add(self._parent_field_name)
self._parent._on_change(self._parent_field_name)
@@ -772,62 +817,53 @@ class Wizard(object):
assert len(set(type(x) for x in models)) == 1
super(Wizard, self).__init__()
self.name = name
- self.state = None
- self.states = ['init']
self.form = None
+ self.form_state = None
self._config = config or proteus.config.get_config()
self._context = context or {}
self._proxy = self._config.get_proxy(name, type='wizard')
- self.id = self._proxy.create(self._config.context)
- if models:
- self.datas = {
- 'model': models[0].__class__.__name__,
- 'id': models[0].id,
- 'ids': [model.id for model in models]
- }
- else:
- self.datas = {}
- self.execute('init')
+ result = self._proxy.create(self._config.context)
+ self.session_id, self.start_state, self.end_state = result
+ self.states = [self.start_state]
+ self.models = models
+ self.execute(self.start_state)
def execute(self, state):
assert state in self.states
- if 'form' not in self.datas:
- self.datas['form'] = {}
-
- if self.form:
- self.datas['form'].update(self.form._get_values())
-
self.state = state
while self.state != 'end':
ctx = self._context.copy()
ctx.update(self._config.context)
- ctx['active_id'] = self.datas.get('id')
- ctx['active_ids'] = self.datas.get('ids')
-
- res = self._proxy.execute(self.id, self.datas, self.state, ctx)
- if not res:
- break
-
- if 'datas' in res:
- self.datas['form'] = res['datas']
- elif res['type'] == 'form':
- self.datas['form'] = {}
-
- if res['type'] == 'form':
- self.states = [x[0] for x in res['state']]
- # XXX set context
- self.form = Model.get(res['object'])()
- self.form._default_set(self.datas['form'])
+ if self.models:
+ ctx['active_id'] = self.models[0].id
+ ctx['active_ids'] = [model.id for model in self.models]
+ ctx['active_model'] = self.models[0].__class__.__name__
+ else:
+ ctx['active_id'] = None
+ ctx['active_ids'] = None
+ ctx['active_model'] = None
+
+ if self.form:
+ data = {self.form_state: self.form._get_on_change_value()}
+ else:
+ data = {}
+
+ result = self._proxy.execute(self.session_id, data, self.state,
+ ctx)
+
+ if 'view' in result:
+ view = result['view']
+ self.form = Model.get(view['fields_view']['model'])()
+ self.form._default_set(view['defaults'])
+ self.states = [b['state'] for b in view['buttons']]
+ self.form_state = view['state']
return
- elif res['type'] == 'action':
- # TODO run action
- self.state = res['state']
- elif res['type'] == 'print':
- # TODO run print
- self.state = res['state']
- elif res['type'] == 'state':
- self.state = res['state']
-
- if self.state == 'end':
- self._proxy.delete(self.id, self._config.context)
+ else:
+ self.state = self.end_state
+
+ if 'actions' in result:
+ pass # TODO
+
+ if self.state == self.end_state:
+ self._proxy.delete(self.session_id, self._config.context)
diff --git a/proteus/config.py b/proteus/config.py
index a374c5b..ef02ba2 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -8,14 +8,16 @@ __all__ = ['set_trytond', 'set_xmlrpc', 'get_config']
import xmlrpclib
import threading
from decimal import Decimal
-from types import NoneType
import datetime
import time
+
def dump_decimal(self, value, write):
- write("<value><double>")
- write(str(value))
- write("</double></value>\n")
+ value = {'__class__': 'Decimal',
+ 'decimal': str(value),
+ }
+ self.dump_struct(value, write)
+
def dump_buffer(self, value, write):
self.write = write
@@ -23,16 +25,48 @@ def dump_buffer(self, value, write):
value.encode(self)
del self.write
+
+def dump_date(self, value, write):
+ value = {'__class__': 'date',
+ 'year': value.year,
+ 'month': value.month,
+ 'day': value.day,
+ }
+ self.dump_struct(value, write)
+
+
+def dump_time(self, value, write):
+ value = {'__class__': 'time',
+ 'hour': value.hour,
+ 'minute': value.minute,
+ 'second': value.second,
+ }
+ self.dump_struct(value, write)
+
xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
-xmlrpclib.Marshaller.dispatch[datetime.date] = \
- lambda self, value, write: self.dump_datetime(
- datetime.datetime.combine(value, datetime.time()), write)
+xmlrpclib.Marshaller.dispatch[datetime.date] = dump_date
+xmlrpclib.Marshaller.dispatch[datetime.time] = dump_time
xmlrpclib.Marshaller.dispatch[buffer] = dump_buffer
-def _end_double(self, data):
- self.append(Decimal(data))
+
+def end_struct(self, data):
+ mark = self._marks.pop()
+ # map structs to Python dictionaries
+ dct = {}
+ items = self._stack[mark:]
+ for i in range(0, len(items), 2):
+ dct[xmlrpclib._stringify(items[i])] = items[i + 1]
+ if '__class__' in dct:
+ if dct['__class__'] == 'date':
+ dct = datetime.date(dct['year'], dct['month'], dct['day'])
+ elif dct['__class__'] == 'time':
+ dct = datetime.time(dct['hour'], dct['minute'], dct['second'])
+ elif dct['__class__'] == 'Decimal':
+ dct = Decimal(dct['decimal'])
+ self._stack[mark:] = [dct]
self._value = 0
-xmlrpclib.Unmarshaller.dispatch["double"] = _end_double
+
+xmlrpclib.Unmarshaller.dispatch['struct'] = end_struct
_CONFIG = threading.local()
_CONFIG.current = None
@@ -68,10 +102,15 @@ class _TrytondMethod(object):
from trytond.cache import Cache
from trytond.transaction import Transaction
- assert self._name in self._object._rpc
+ if self._name in self._object._rpc:
+ readonly = not self._object._rpc[self._name]
+ elif self._name in getattr(self._object, '_buttons', {}):
+ readonly = False
+ else:
+ raise TypeError('%s is not callable' % self._name)
with Transaction().start(self._config.database_name,
- self._config.user) as transaction:
+ self._config.user, readonly=readonly) as transaction:
Cache.clean(self._config.database_name)
args = list(args)
context = args.pop()
@@ -80,11 +119,12 @@ class _TrytondMethod(object):
del context['_timestamp']
transaction.context = context
res = getattr(self._object, self._name)(*args)
- if self._object._rpc[self._name]:
+ if not readonly:
transaction.cursor.commit()
Cache.resets(self._config.database_name)
return res
+
class TrytondProxy(object):
'Proxy for function call for trytond'
@@ -154,8 +194,9 @@ class TrytondConfig(Config):
__init__.__doc__ = object.__init__.__doc__
def __repr__(self):
- return "proteus.config.TrytondConfig('%s', '%s', '%s', config_file=%s)"\
- % (self.database_name, self._user, self.database_type,
+ return "proteus.config.TrytondConfig"\
+ "('%s', '%s', '%s', config_file=%s)"\
+ % (self.database_name, self._user, self.database_type,
self.config_file)
__repr__.__doc__ = object.__repr__.__doc__
@@ -178,7 +219,11 @@ class TrytondConfig(Config):
def get_proxy_methods(self, name, type='model'):
'Return list of methods'
proxy = self.get_proxy(name, type=type)
- return [x for x in proxy._object._rpc]
+ methods = [x for x in proxy._object._rpc]
+ if hasattr(proxy._object, '_buttons'):
+ methods += [x for x in proxy._object._buttons]
+ return methods
+
def set_trytond(database_name=None, user='admin', database_type=None,
language='en_US', password='', config_file=None):
@@ -201,6 +246,7 @@ class XmlrpcProxy(object):
'Return attribute value'
return getattr(self._object, name)
+
class XmlrpcConfig(Config):
'Configuration for XML-RPC'
@@ -236,10 +282,12 @@ class XmlrpcConfig(Config):
if x.startswith(object_)
and '.' not in x[len(object_) + 1:]]
+
def set_xmlrpc(url):
'Set XML-RPC as backend'
_CONFIG.current = XmlrpcConfig(url)
return _CONFIG.current
+
def get_config():
return _CONFIG.current
diff --git a/proteus/pyson.py b/proteus/pyson.py
index 5eca3cb..830c057 100644
--- a/proteus/pyson.py
+++ b/proteus/pyson.py
@@ -1,13 +1,14 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
__all__ = ['PYSONEncoder', 'PYSONDecoder', 'Eval', 'Not', 'Bool', 'And', 'Or',
- 'Equal', 'Greater', 'Less', 'If', 'Get', 'In', 'Date', 'DateTime']
-import sys
-if sys.version_info < (2, 6):
+ 'Equal', 'Greater', 'Less', 'If', 'Get', 'In', 'Date', 'DateTime']
+try:
import simplejson as json
-else:
+except ImportError:
import json
import datetime
+from dateutil.relativedelta import relativedelta
+from functools import reduce
class PYSON(object):
@@ -22,6 +23,64 @@ class PYSON(object):
def eval(dct, context):
raise NotImplementedError
+ def __invert__(self):
+ if self.types() != set([bool]):
+ return Not(Bool(self))
+ else:
+ return Not(self)
+
+ def __and__(self, other):
+ if (isinstance(self, And)
+ and not isinstance(self, Or)):
+ self._statements.append(other)
+ return self
+ if (isinstance(other, PYSON)
+ and other.types() != set([bool])):
+ other = Bool(other)
+ if self.types() != set([bool]):
+ return And(Bool(self), other)
+ else:
+ return And(self, other)
+
+ def __or__(self, other):
+ if isinstance(self, Or):
+ self._statements.append(other)
+ return self
+ if (isinstance(other, PYSON)
+ and other.types() != set([bool])):
+ other = Bool(other)
+ if self.types() != set([bool]):
+ return Or(Bool(self), other)
+ else:
+ return Or(self, other)
+
+ def __eq__(self, other):
+ return Equal(self, other)
+
+ def __ne__(self, other):
+ return Not(Equal(self, other))
+
+ def __gt__(self, other):
+ return Greater(self, other)
+
+ def __ge__(self, other):
+ return Greater(self, other, True)
+
+ def __lt__(self, other):
+ return Less(self, other)
+
+ def __le__(self, other):
+ return Less(self, other, True)
+
+ def get(self, k, d=''):
+ return Get(self, k, d)
+
+ def in_(self, obj):
+ return In(self, obj)
+
+ def contains(self, k):
+ return In(k, self)
+
class PYSONEncoder(json.JSONEncoder):
@@ -133,7 +192,7 @@ class And(PYSON):
assert isinstance(statement, bool), \
'statement must be boolean'
assert len(statements) >= 2, 'must have at least 2 statements'
- self._statements = statements
+ self._statements = list(statements)
def pyson(self):
return {
@@ -250,7 +309,8 @@ class If(PYSON):
def __init__(self, condition, then_statement, else_statement=None):
super(If, self).__init__()
if isinstance(condition, PYSON):
- assert condition.types() == set([bool]), 'condition must be boolean'
+ assert condition.types() == set([bool]), \
+ 'condition must be boolean'
else:
assert isinstance(condition, bool), 'condition must be boolean'
if isinstance(then_statement, PYSON):
@@ -396,23 +456,14 @@ class Date(PYSON):
@staticmethod
def eval(dct, context):
- date = datetime.date.today()
- replace = {}
- for i, j in (('y', 'year'), ('M', 'month'), ('d', 'day')):
- if dct[i] is not None:
- replace[j] = dct[i]
- date = date.replace(**replace)
- if dct['dy']:
- year = date.year + dct['dy']
- date = date.replace(year=year)
- if dct['dM']:
- month = date.month + dct['dM']
- year = date.year + month / 12
- month = month % 12
- date = date.replace(year=year, month=month)
- if dct['dd']:
- date += datetime.timedelta(days=dct['dd'])
- return date
+ return datetime.date.today() + relativedelta(
+ year=dct['y'],
+ month=dct['M'],
+ day=dct['d'],
+ years=dct['dy'],
+ months=dct['dM'],
+ days=dct['dd'],
+ )
class DateTime(Date):
@@ -460,22 +511,23 @@ class DateTime(Date):
@staticmethod
def eval(dct, context):
- date = Date.eval(dct, context)
- datetime_ = datetime.datetime.combine(date,
- datetime.datetime.now().time())
- replace = {}
- for i, j in (('h', 'hour'), ('m', 'minute'), ('s', 'second'),
- ('ms', 'microsecond')):
- if dct[i] is not None:
- replace[j] = dct[i]
- datetime_ = datetime_.replace(**replace)
- delta = {}
- for i, j in (('dh', 'hours'), ('dm', 'minutes'), ('ds', 'seconds'),
- ('dms', 'microseconds')):
- if dct[i]:
- delta[j] = dct[i]
- datetime_ += datetime.timedelta(**delta)
- return datetime_
+ return datetime.datetime.now() + relativedelta(
+ year=dct['y'],
+ month=dct['M'],
+ day=dct['d'],
+ hour=dct['h'],
+ minute=dct['m'],
+ second=dct['s'],
+ microsecond=dct['ms'],
+ years=dct['dy'],
+ months=dct['dM'],
+ days=dct['dd'],
+ hours=dct['dh'],
+ minutes=dct['dm'],
+ seconds=dct['ds'],
+ microseconds=dct['dms'],
+ )
+
CONTEXT = {
'Eval': Eval,
diff --git a/proteus/tests/__init__.py b/proteus/tests/__init__.py
index fe882b9..baddecf 100644
--- a/proteus/tests/__init__.py
+++ b/proteus/tests/__init__.py
@@ -4,6 +4,7 @@ import os
import sys
import unittest
+
def test_suite():
suite = unittest.TestSuite()
loader = unittest.TestLoader()
@@ -15,6 +16,7 @@ def test_suite():
suite.addTests(loader.loadTestsFromModule(module))
return suite
+
def main():
suite = test_suite()
runner = unittest.TextTestRunner()
diff --git a/proteus/tests/test_model.py b/proteus/tests/test_model.py
index 704722b..db6243c 100644
--- a/proteus/tests/test_model.py
+++ b/proteus/tests/test_model.py
@@ -39,7 +39,7 @@ class TestModel(TestCase):
admin.create_uid = admin
admin.create_uid = None
- test = User(write_uid=False)
+ User(write_uid=False)
def test_one2many(self):
Group = Model.get('res.group')
@@ -241,7 +241,7 @@ class TestModel(TestCase):
self.assertNotEqual(admin1, None)
self.assertNotEqual(admin1, False)
- self.failUnlessRaises(NotImplementedError, lambda: admin1 == 1)
+ self.assertRaises(NotImplementedError, lambda: admin1 == 1)
def test_default_set(self):
User = Model.get('res.user')
@@ -289,6 +289,14 @@ class TestModel(TestCase):
trigger.on_create = True
self.assertEqual(trigger.on_time, False)
+ def test_on_change_with(self):
+ Attachment = Model.get('ir.attachment')
+
+ attachment = Attachment()
+
+ attachment.description = 'Test'
+ self.assertEqual(attachment.summary, 'Test')
+
def test_on_change_set(self):
User = Model.get('res.user')
Group = Model.get('res.group')
diff --git a/proteus/tests/test_wizard.py b/proteus/tests/test_wizard.py
index 2b824c3..86fb2a8 100644
--- a/proteus/tests/test_wizard.py
+++ b/proteus/tests/test_wizard.py
@@ -12,14 +12,18 @@ class TestWizard(TestCase):
def test_translation_clean(self):
translation_clean = Wizard('ir.translation.clean')
self.assertEqual(translation_clean.form.__class__.__name__,
- 'ir.translation.clean.init')
- translation_clean.execute('start')
+ 'ir.translation.clean.start')
+ translation_clean.execute('clean')
+ self.assertEqual(translation_clean.form.__class__.__name__,
+ 'ir.translation.clean.succeed')
def test_translation_export(self):
+ Lang = Model.get('ir.lang')
+ Module = Model.get('ir.module.module')
translation_export = Wizard('ir.translation.export')
- translation_export.form.lang = 'en_US'
- translation_export.form.module = 'ir'
- translation_export.execute('start')
+ translation_export.form.language, = Lang.find([('code', '=', 'en_US')])
+ translation_export.form.module, = Module.find([('name', '=', 'ir')])
+ translation_export.execute('export')
self.assert_(translation_export.form.file)
translation_export.execute('end')
diff --git a/setup.py b/setup.py
index 4d1e957..1799c38 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,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.
from setuptools import setup, find_packages
-import sys
import os
import proteus
@@ -10,6 +9,7 @@ major_version, minor_version, _ = proteus.__version__.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -36,9 +36,14 @@ setup(name='proteus',
'Topic :: Office/Business',
],
license='LGPL-3',
+ install_requires=[
+ "python-dateutil",
+ ],
extras_require={
'trytond': ['trytond >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1)],
+ 'simplejson': ['simplejson'],
+ 'cdecimal': ['cdecimal'],
},
test_suite='proteus.tests',
tests_require=('trytond >= %s.%s, < %s.%s' %
commit 04cccb92a2cbe6074cb75c9f26576e5aeb4a0979
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index 0b53b66..5b70b16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2010-2011 Cedric Krier
commit 5747bf46c9fcccbf3f042bfbe7dbb4209cfa86bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:04 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index e0e61d3..0b53b66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Copyright:
License: LGPL-3+
Files: debian/*
-Copyright: (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: LGPL-3+
commit 49ffd7e25fe5cd177629922ea7a1df58c61907e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:03 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index db81f9e..5caba0a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
commit 3f009ddf7738790ef5c6750bd2c273c46bf0df20
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:16 2011 +0100
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index bd0df3d..115f2d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-proteus (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Changing license to LGPL-3+ according to upstream.
+ * Bumping X-Python-Version to >=2.6.
+ * Merging upstream version 2.2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 13:56:23 +0100
+
tryton-proteus (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit 9b4795fb96cad745e3a92d04c4c6503fbcb65f6c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 13:35:55 2011 +0100
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index f9e9b9a..ff71820 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
* Change license to LGPL-3
diff --git a/PKG-INFO b/PKG-INFO
index 31eb9b1..5737c16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: proteus
-Version: 2.2.0
+Version: 2.2.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 31eb9b1..5737c16 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: proteus
-Version: 2.2.0
+Version: 2.2.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 828c209..f07cd72 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.2.0"
+__version__ = "2.2.1"
__all__ = ['Model', 'Wizard']
from types import NoneType
import threading
@@ -91,6 +91,14 @@ class CharDescriptor(FieldDescriptor):
super(CharDescriptor, self).__set__(instance, value or '')
+class BinaryDescriptor(FieldDescriptor):
+ default = None
+
+ def __set__(self, instance, value):
+ assert isinstance(value, (basestring, buffer)) or value in (None, False)
+ super(BinaryDescriptor, self).__set__(instance, value or '')
+
+
class IntegerDescriptor(FieldDescriptor):
default = 0
@@ -295,7 +303,7 @@ class MetaModelFactory(object):
'char': CharDescriptor,
'text': CharDescriptor,
'sha': CharDescriptor,
- 'binary': CharDescriptor,
+ 'binary': BinaryDescriptor,
'selection': CharDescriptor, # TODO implement its own descriptor
'integer': IntegerDescriptor,
'biginteger': IntegerDescriptor,
@@ -701,8 +709,12 @@ class Model(object):
for vals in value.get('add', []):
relation = Model.get(self._fields[field]['relation'],
self._config)
+ record = relation()
+ for i, j in vals.iteritems():
+ record._values[i] = j
+ record._changed.add(i)
# append without signal
- list.append(getattr(self, field), relation(**vals))
+ list.append(getattr(self, field), record)
for vals in value.get('update', []):
if 'id' not in vals:
continue
@@ -735,8 +747,6 @@ class Model(object):
self._on_change_set(field, value)
for field, value in later.iteritems():
self._on_change_set(field, value)
- if self._parent:
- self._parent._changed.add(self._parent_field_name)
for field, definition in self._fields.iteritems():
if not definition.get('on_change_with'):
continue
@@ -749,6 +759,9 @@ class Model(object):
res = getattr(self._proxy, 'on_change_with_%s' % field)(args,
context)
self._on_change_set(field, res)
+ if self._parent:
+ self._parent._changed.add(self._parent_field_name)
+ self._parent._on_change(self._parent_field_name)
class Wizard(object):
diff --git a/proteus/config.py b/proteus/config.py
index 2eccfff..a374c5b 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -17,10 +17,17 @@ def dump_decimal(self, value, write):
write(str(value))
write("</double></value>\n")
+def dump_buffer(self, value, write):
+ self.write = write
+ value = xmlrpclib.Binary(value)
+ value.encode(self)
+ del self.write
+
xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
xmlrpclib.Marshaller.dispatch[datetime.date] = \
lambda self, value, write: self.dump_datetime(
datetime.datetime.combine(value, datetime.time()), write)
+xmlrpclib.Marshaller.dispatch[buffer] = dump_buffer
def _end_double(self, data):
self.append(Decimal(data))
commit 82fdd813e2140e67e99fc6a61e45fa917954d150
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 13:23:26 2011 +0100
Changing license to LGPL-3+ according to upstream.
diff --git a/debian/copyright b/debian/copyright
index 7159a8f..e0e61d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,29 @@ Files: *
Copyright:
(C) 2010-2011 Cedric Krier
(C) 2010-2011 B2CK SPRL
-License: GPL-3+
+License: LGPL-3+
Files: debian/*
Copyright: (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
+License: LGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU Lesser General Public License
+ can be found in /usr/share/common-licenses/LGPL-3 file.
+
License: GPL-3+
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
commit 5bd5ebaa9e6c6e0f6c152b2378f6d7f136581244
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:46 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index ed191bc..db81f9e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-proteus
Architecture: all
commit 2172c5e76ecdbe95b6da2826fa439593223e411b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:38 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index f604f5a..f9e9b9a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 2.2.0 - 2011-10-25
+* Bug fixes (see mercurial logs for details)
+* Change license to LGPL-3
+* Drop support of Python 2.5
+
Version 2.0.0 - 2011-04-28
* Bug fixes (see mercurial logs for details)
* Manage default values of trytond configuration
diff --git a/COPYRIGHT b/COPYRIGHT
index 34a6d18..de261a6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010 Cédric Krier.
-Copyright (C) 2010 B2CK SPRL.
+Copyright (C) 2010-2011 Cédric Krier.
+Copyright (C) 2010-2011 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
diff --git a/INSTALL b/INSTALL
index a87c0a0..4267630 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing proteus
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
Installation
diff --git a/LICENSE b/LICENSE
index 94a9ed0..fc8a5de 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,165 @@
- GNU GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/PKG-INFO b/PKG-INFO
index 6faf1a5..31eb9b1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.0.0
+Version: 2.2.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
-License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+License: LGPL-3
+Download-URL: http://downloads.tryton.org/2.2/
Description: proteus
=======
@@ -142,7 +142,8 @@ Classifier: Environment :: Plugins
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 6faf1a5..31eb9b1 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 2.0.0
+Version: 2.2.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
-License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+License: LGPL-3
+Download-URL: http://downloads.tryton.org/2.2/
Description: proteus
=======
@@ -142,7 +142,8 @@ Classifier: Environment :: Plugins
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index 6e4caf7..747ad85 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -1,4 +1,4 @@
[trytond]
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 060f0f0..828c209 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.0.0"
+__version__ = "2.2.0"
__all__ = ['Model', 'Wizard']
from types import NoneType
import threading
@@ -55,6 +55,7 @@ class FieldDescriptor(object):
super(FieldDescriptor, self).__init__()
self.name = name
self.definition = definition
+ self.__doc__ = definition['string']
def __get__(self, instance, owner):
if instance.id > 0 and self.name not in instance._values:
@@ -87,7 +88,7 @@ class CharDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, basestring) or value in (None, False)
- super(CharDescriptor, self).__set__(instance, value)
+ super(CharDescriptor, self).__set__(instance, value or '')
class IntegerDescriptor(FieldDescriptor):
@@ -173,6 +174,10 @@ class Many2OneDescriptor(FieldDescriptor):
super(Many2OneDescriptor, self).__set__(instance, value)
+class One2OneDescriptor(Many2OneDescriptor):
+ pass
+
+
class One2ManyDescriptor(FieldDescriptor):
default = []
@@ -218,6 +223,10 @@ class Many2OneValueDescriptor(ValueDescriptor):
return value and value.id or False
+class One2OneValueDescriptor(Many2OneValueDescriptor):
+ pass
+
+
class One2ManyValueDescriptor(ValueDescriptor):
def __get__(self, instance, owner):
value = [('add', [])]
@@ -229,8 +238,7 @@ class One2ManyValueDescriptor(ValueDescriptor):
fields=record._changed)))
value[0][1].append(record.id)
else:
- value.append(('create', record._get_values(
- fields=record._changed)))
+ value.append(('create', record._get_values()))
if value_list.record_removed:
value.append(('unlink', [x.id for x in value_list.record_removed]))
if value_list.record_deleted:
@@ -268,6 +276,10 @@ class Many2OneEvalDescriptor(EvalDescriptor):
return False
+class One2OneEvalDescriptor(Many2OneEvalDescriptor):
+ pass
+
+
class One2ManyEvalDescriptor(EvalDescriptor):
def __get__(self, instance, owner):
return [x.id for x in getattr(instance, self.name)]
@@ -296,18 +308,21 @@ class MetaModelFactory(object):
'many2one': Many2OneDescriptor,
'one2many': One2ManyDescriptor,
'many2many': Many2ManyDescriptor,
+ 'one2one': One2OneDescriptor,
}
value_descriptors = {
'reference': ReferenceValueDescriptor,
'many2one': Many2OneValueDescriptor,
'one2many': One2ManyValueDescriptor,
'many2many': Many2ManyValueDescriptor,
+ 'one2one': One2OneValueDescriptor,
}
eval_descriptors = {
'reference': ReferenceEvalDescriptor,
'many2one': Many2OneEvalDescriptor,
'one2many': One2ManyEvalDescriptor,
'many2many': Many2ManyEvalDescriptor,
+ 'one2one': One2OneEvalDescriptor,
}
def __init__(self, model_name, config=None):
diff --git a/proteus/config.py b/proteus/config.py
index 3059336..2eccfff 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -48,11 +48,6 @@ class Config(object):
def get_proxy_methods(self, name):
raise NotImplementedError
- def __eq__(self, other):
- if isinstance(other, Config):
- return repr(self) == repr(other)
- return NotImplemented
-
class _TrytondMethod(object):
@@ -101,10 +96,10 @@ class TrytondConfig(Config):
'Configuration for trytond'
def __init__(self, database_name=None, user='admin', database_type=None,
- language='en_US', password=''):
+ language='en_US', password='', config_file=None):
super(TrytondConfig, self).__init__()
from trytond.config import CONFIG
- CONFIG.parse()
+ CONFIG.update_etc(config_file)
if database_type is not None:
CONFIG['db_type'] = database_type
from trytond.modules import register_classes
@@ -121,6 +116,7 @@ class TrytondConfig(Config):
database_name = 'test_%s' % int(time.time())
self.database_name = database_name
self._user = user
+ self.config_file = config_file
register_classes()
@@ -151,10 +147,23 @@ class TrytondConfig(Config):
__init__.__doc__ = object.__init__.__doc__
def __repr__(self):
- return "proteus.config.TrytondConfig('%s', '%s', '%s')" % (
- self.database_name, self._user, self.database_type)
+ return "proteus.config.TrytondConfig('%s', '%s', '%s', config_file=%s)"\
+ % (self.database_name, self._user, self.database_type,
+ self.config_file)
__repr__.__doc__ = object.__repr__.__doc__
+ def __eq__(self, other):
+ if not isinstance(other, TrytondConfig):
+ raise NotImplementedError
+ return (self.database_name == other.database_name
+ and self._user == other._user
+ and self.database_type == other.database_type
+ and self.config_file == other.config_file)
+
+ def __hash__(self):
+ return hash((self.database_name, self._user,
+ self.database_type, self.config_file))
+
def get_proxy(self, name, type='model'):
'Return Proxy class'
return TrytondProxy(name, self, type=type)
@@ -165,10 +174,10 @@ class TrytondConfig(Config):
return [x for x in proxy._object._rpc]
def set_trytond(database_name=None, user='admin', database_type=None,
- language='en_US', password=''):
+ language='en_US', password='', config_file=None):
'Set trytond package as backend'
_CONFIG.current = TrytondConfig(database_name, user, database_type,
- language=language, password=password)
+ language=language, password=password, config_file=config_file)
return _CONFIG.current
@@ -200,6 +209,14 @@ class XmlrpcConfig(Config):
return "proteus.config.XmlrpcConfig('%s')" % self.url
__repr__.__doc__ = object.__repr__.__doc__
+ def __eq__(self, other):
+ if not isinstance(other, XmlrpcConfig):
+ raise NotImplementedError
+ return self.url == other.url
+
+ def __hash__(self):
+ return hash(self.url)
+
def get_proxy(self, name, type='model'):
'Return Proxy class'
return XmlrpcProxy(name, self, type=type)
diff --git a/proteus/tests/test_config.py b/proteus/tests/test_config.py
index 8c568b4..35433a3 100644
--- a/proteus/tests/test_config.py
+++ b/proteus/tests/test_config.py
@@ -26,4 +26,4 @@ class TestConfig(TestCase):
config2 = proteus.config.get_config()
self.assertEqual(config1, config2)
- self.assertEqual(config1.__eq__(None), NotImplemented)
+ self.assertRaises(NotImplementedError, config1.__eq__, None)
diff --git a/setup.py b/setup.py
index 6ed5377..4d1e957 100644
--- a/setup.py
+++ b/setup.py
@@ -10,10 +10,6 @@ major_version, minor_version, _ = proteus.__version__.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-SIMPLEJSON = []
-if sys.version_info < (2, 6):
- SIMPLEJSON = ['simplejson']
-
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -33,13 +29,13 @@ setup(name='proteus',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
- license='GPL-3',
- install_requires=SIMPLEJSON,
+ license='LGPL-3',
extras_require={
'trytond': ['trytond >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1)],
commit d70b0222784e15464c01b4a735c0b313624c4f01
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:26:46 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index 666d191..bd0df3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-proteus (2.0.0-2) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+ * Compacting copyright file.
+ * Moving to source format 3.0 (quilt).
+ * Updating manpage.
+
+ [ Mathias Behrle ]
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:26:41 +0200
+
tryton-proteus (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 1ab122b1eb9e1c03a7a3e0bf4a232da70fc697af
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 19:36:17 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index e3b4868..ed191bc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
+X-Python-Version: >= 2.5
Package: tryton-proteus
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit cf227d5a9277d8ce956c5e7bfc64dd3d12035417
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:10:31 2011 +0200
Updating manpage.
diff --git a/debian/manpages/proteus.1 b/debian/manpages/proteus.1
index efe040e..c2550ac 100644
--- a/debian/manpages/proteus.1
+++ b/debian/manpages/proteus.1
@@ -1,4 +1,4 @@
-.TH PROTEUS 1 "2011\-01\-15" "1.8" "Tryton Application Platform"
+.TH PROTEUS 1 "2011\-07\-11" "2.0" "Tryton Application Platform"
.SH NAME
proteus \- Tryton Application Platform (Proteus)
@@ -21,4 +21,4 @@ More information about Tryton Proteus and the Tryton project can be found at <\f
.SH AUTHOR
Tryton proteus was written by the Tryton project <\fIhttp://www.tryton.org/\fR>.
.PP
-This manual page was written by Mathias Behrle <\fImathiasb at m9s.biz\fR>, for the Debian project (but may be used by others).
+This manual page was written by Mathias Behrle <\fImathiasb at m9s.biz\fR>.
commit fede02f4baae4b56b6d4bafe8a0cd57042957cf7
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:09:55 2011 +0200
Moving to source format 3.0 (quilt).
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit 32ef96f02c9f328a46ed2feb00c3ded20ff6ed32
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:09:48 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index 1e46969..7159a8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,14 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2010-2011 Cedric Krier
(C) 2010-2011 B2CK SPRL
License: GPL-3+
- 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
+
+License: GPL-3+
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
the Free Software Foundation, either version 3 of the License, or
@@ -40,5 +22,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit 8813b23295f80e0db177733712c9d2c7ddf67baf
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:09:23 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index f41aa58..e3b4868 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-proteus
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 675a6d7b88b85f8da6295c7891ddf05d13bc0034
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:09 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 3d28bd8..666d191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-proteus (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:37:33 +0200
+
tryton-proteus (1.8.1-1) unstable; urgency=low
* Merging upstream version 1.8.1.
commit 75bd795737bb017f1470564be6d4db14a71f7411
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:13:30 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7624c29..f604f5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-28
* Bug fixes (see mercurial logs for details)
+* Manage default values of trytond configuration
Version 1.8.0 - 2010-12-24
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index de261a6..34a6d18 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2011 Cédric Krier.
-Copyright (C) 2010-2011 B2CK SPRL.
+Copyright (C) 2010 Cédric Krier.
+Copyright (C) 2010 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
diff --git a/INSTALL b/INSTALL
index 04691dd..a87c0a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing proteus
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index ad01dde..6faf1a5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 1.8.1
+Version: 2.0.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: proteus
=======
@@ -30,6 +30,8 @@ Description: proteus
>>> config = config.set_trytond(':memory:', database_type='sqlite')
When connecting to a database that doesn't exist, Proteus will create it.
+ If no database name was given, then Proteus will generate one. It will choose
+ ':memory': for 'sqlite' type otherwise `'test_%' % int(time.time())`.
Installing a module
~~~~~~~~~~~~~~~~~~~
diff --git a/README b/README
index b4a4955..7e0a957 100644
--- a/README
+++ b/README
@@ -21,6 +21,8 @@ Configuration to connect to a sqlite memory database using trytond as module.
>>> config = config.set_trytond(':memory:', database_type='sqlite')
When connecting to a database that doesn't exist, Proteus will create it.
+If no database name was given, then Proteus will generate one. It will choose
+':memory': for 'sqlite' type otherwise `'test_%' % int(time.time())`.
Installing a module
~~~~~~~~~~~~~~~~~~~
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index ad01dde..6faf1a5 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: proteus
-Version: 1.8.1
+Version: 2.0.0
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: proteus
=======
@@ -30,6 +30,8 @@ Description: proteus
>>> config = config.set_trytond(':memory:', database_type='sqlite')
When connecting to a database that doesn't exist, Proteus will create it.
+ If no database name was given, then Proteus will generate one. It will choose
+ ':memory': for 'sqlite' type otherwise `'test_%' % int(time.time())`.
Installing a module
~~~~~~~~~~~~~~~~~~~
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index 275aecc..6e4caf7 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -1,4 +1,4 @@
[trytond]
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index e76c87b..060f0f0 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
'''
A library to access Tryton's models like a client.
'''
-__version__ = "1.8.1"
+__version__ = "2.0.0"
__all__ = ['Model', 'Wizard']
from types import NoneType
import threading
@@ -86,7 +86,7 @@ class CharDescriptor(FieldDescriptor):
default = None
def __set__(self, instance, value):
- assert isinstance(value, basestring)
+ assert isinstance(value, basestring) or value in (None, False)
super(CharDescriptor, self).__set__(instance, value)
@@ -102,8 +102,7 @@ class FloatDescriptor(FieldDescriptor):
default = 0.0
def __set__(self, instance, value):
- assert isinstance(value, float)
- super(FloatDescriptor, self).__set__(instance, value)
+ super(FloatDescriptor, self).__set__(instance, float(value))
class NumericDescriptor(FieldDescriptor):
@@ -145,13 +144,13 @@ class DateDescriptor(FieldDescriptor):
return value
def __set__(self, instance, value):
- assert isinstance(value, datetime.date)
+ assert isinstance(value, datetime.date) or value in (None, False)
super(DateDescriptor, self).__set__(instance, value)
class DateTimeDescriptor(FieldDescriptor):
def __set__(self, instance, value):
- assert isinstance(value, datetime.datetime)
+ assert isinstance(value, datetime.datetime) or value in (None, False)
super(DateTimeDescriptor, self).__set__(instance, value)
@@ -487,10 +486,12 @@ class Model(object):
for x in value]
getattr(self, field_name).extend(value)
else:
- if (definition['type'] == 'many2one'
- and isinstance(value, (int, long))):
- relation = Model.get(definition['relation'])
- value = relation(value)
+ if definition['type'] == 'many2one':
+ if (isinstance(value, (int, long)) and value is not False):
+ relation = Model.get(definition['relation'])
+ value = relation(value)
+ elif value is False:
+ value = None
setattr(self, field_name, value)
__init__.__doc__ = object.__init__.__doc__
@@ -609,6 +610,12 @@ class Model(object):
fields.append(name)
self._values.update(self._proxy.read(self.id, fields,
self._config.context))
+ for field in fields:
+ if (field in self._fields
+ and self._fields[field]['type'] == 'float'
+ and isinstance(self._values[field], Decimal)):
+ # XML-RPC return Decimal for double
+ self._values[field] = float(self._values[field])
def _default_get(self):
'Set default values'
@@ -715,11 +722,6 @@ class Model(object):
self._on_change_set(field, value)
if self._parent:
self._parent._changed.add(self._parent_field_name)
- if definition.get('change_default'):
- context = self._config.context
- default = Model.get('ir.default', config=self._config)
- self._default_set(default.get_default(self.__class__.__name__,
- '%s=%s' % (name, self._get_values([name])[name]), context))
for field, definition in self._fields.iteritems():
if not definition.get('on_change_with'):
continue
diff --git a/proteus/config.py b/proteus/config.py
index 6a7b2a6..3059336 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -10,6 +10,7 @@ import threading
from decimal import Decimal
from types import NoneType
import datetime
+import time
def dump_decimal(self, value, write):
write("<value><double>")
@@ -21,7 +22,13 @@ xmlrpclib.Marshaller.dispatch[datetime.date] = \
lambda self, value, write: self.dump_datetime(
datetime.datetime.combine(value, datetime.time()), write)
+def _end_double(self, data):
+ self.append(Decimal(data))
+ self._value = 0
+xmlrpclib.Unmarshaller.dispatch["double"] = _end_double
+
_CONFIG = threading.local()
+_CONFIG.current = None
class Config(object):
@@ -93,21 +100,27 @@ class TrytondProxy(object):
class TrytondConfig(Config):
'Configuration for trytond'
- def __init__(self, database_name, user, database_type, language='en_US',
- password=''):
+ def __init__(self, database_name=None, user='admin', database_type=None,
+ language='en_US', password=''):
super(TrytondConfig, self).__init__()
from trytond.config import CONFIG
- CONFIG['db_type'] = database_type
CONFIG.parse()
+ if database_type is not None:
+ CONFIG['db_type'] = database_type
from trytond.modules import register_classes
from trytond.pool import Pool
from trytond.backend import Database
from trytond.protocols.dispatcher import create
from trytond.cache import Cache
from trytond.transaction import Transaction
+ self.database_type = CONFIG['db_type']
+ if database_name is None:
+ if self.database_type == 'sqlite':
+ database_name = ':memory:'
+ else:
+ database_name = 'test_%s' % int(time.time())
self.database_name = database_name
self._user = user
- self.database_type = database_type
register_classes()
@@ -151,7 +164,7 @@ class TrytondConfig(Config):
proxy = self.get_proxy(name, type=type)
return [x for x in proxy._object._rpc]
-def set_trytond(database_name, user='admin', database_type='postgresql',
+def set_trytond(database_name=None, user='admin', database_type=None,
language='en_US', password=''):
'Set trytond package as backend'
_CONFIG.current = TrytondConfig(database_name, user, database_type,
@@ -205,5 +218,4 @@ def set_xmlrpc(url):
return _CONFIG.current
def get_config():
- # TODO raise exception if not set
return _CONFIG.current
diff --git a/proteus/tests/test_config.py b/proteus/tests/test_config.py
index 7190524..8c568b4 100644
--- a/proteus/tests/test_config.py
+++ b/proteus/tests/test_config.py
@@ -7,7 +7,7 @@ import proteus.config
class TestConfig(TestCase):
def setUp(self):
- proteus.config.set_trytond(':memory:', database_type='sqlite')
+ proteus.config.set_trytond(database_type='sqlite')
def test_proxy(self):
config = proteus.config.get_config()
@@ -22,7 +22,7 @@ class TestConfig(TestCase):
def test_trytond_config_eq(self):
config1 = proteus.config.get_config()
- proteus.config.set_trytond(':memory:', database_type='sqlite')
+ proteus.config.set_trytond(database_type='sqlite')
config2 = proteus.config.get_config()
self.assertEqual(config1, config2)
diff --git a/proteus/tests/test_model.py b/proteus/tests/test_model.py
index 8d1d760..704722b 100644
--- a/proteus/tests/test_model.py
+++ b/proteus/tests/test_model.py
@@ -7,7 +7,7 @@ from proteus import config, Model
class TestModel(TestCase):
def setUp(self):
- config.set_trytond(':memory:', database_type='sqlite')
+ config.set_trytond(database_type='sqlite')
def test_class_cache(self):
User1 = Model.get('res.user')
@@ -39,6 +39,8 @@ class TestModel(TestCase):
admin.create_uid = admin
admin.create_uid = None
+ test = User(write_uid=False)
+
def test_one2many(self):
Group = Model.get('res.group')
administration = Group.find([('name', '=', 'Administration')])[0]
diff --git a/proteus/tests/test_wizard.py b/proteus/tests/test_wizard.py
index 4541b8a..2b824c3 100644
--- a/proteus/tests/test_wizard.py
+++ b/proteus/tests/test_wizard.py
@@ -7,7 +7,7 @@ from proteus import config, Wizard, Model
class TestWizard(TestCase):
def setUp(self):
- config.set_trytond(':memory:', database_type='sqlite')
+ config.set_trytond(database_type='sqlite')
def test_translation_clean(self):
translation_clean = Wizard('ir.translation.clean')
commit 894a0acdb13ad4f1890b6b8d92d7d6ff878a0094
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:55 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index 554bedb..f41aa58 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
commit bd0d65f6e61a0a3811707b89e9a287aad5aaef25
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:20:06 2011 +0100
Releasing debian version 1.8.1-1.
diff --git a/debian/changelog b/debian/changelog
index a2c2a44..3d28bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-proteus (1.8.1-1) unstable; urgency=low
+
+ * Merging upstream version 1.8.1.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:19:51 +0100
+
tryton-proteus (1.8.0-1) unstable; urgency=low
* Initial release.
commit d4cfe31dacce61102e9cbdd57bde69ec150db8c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:47 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index d242681..1e46969 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2010 Cedric Krier
- (C) 2010 B2CK SPRL
+ (C) 2010-2011 Cedric Krier
+ (C) 2010-2011 B2CK SPRL
License: GPL-3+
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
commit b6d16b2fde247cd7936964ffc5e3490674191d4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 11:46:35 2011 +0100
Merging upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0c22f94..7624c29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-12-24
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 34a6d18..de261a6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010 Cédric Krier.
-Copyright (C) 2010 B2CK SPRL.
+Copyright (C) 2010-2011 Cédric Krier.
+Copyright (C) 2010-2011 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
diff --git a/PKG-INFO b/PKG-INFO
index 3b0bb9f..ad01dde 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: proteus
-Version: 1.8.0
+Version: 1.8.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 3b0bb9f..ad01dde 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: proteus
-Version: 1.8.0
+Version: 1.8.1
Summary: Library to access Tryton server as a client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/proteus/__init__.py b/proteus/__init__.py
index aff60a8..e76c87b 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
'''
A library to access Tryton's models like a client.
'''
-__version__ = "1.8.0"
+__version__ = "1.8.1"
__all__ = ['Model', 'Wizard']
from types import NoneType
import threading
@@ -152,7 +152,7 @@ class DateDescriptor(FieldDescriptor):
class DateTimeDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, datetime.datetime)
- super(DateTimeDescriptor, self).__set_(instance, value)
+ super(DateTimeDescriptor, self).__set__(instance, value)
class Many2OneDescriptor(FieldDescriptor):
commit 196d6877318058f91fd0ba9d0e4ffa97b10d7ae5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jan 14 14:51:14 2011 +0100
Adding debian version 1.8.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0c22f94
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.8.0 - 2010-12-24
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..34a6d18
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2010 Cédric Krier.
+Copyright (C) 2010 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..04691dd
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,26 @@
+Installing proteus
+==================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the proteus source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..e109118
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include LICENSE
+include COPYRIGHT
+include README
+include INSTALL
+include CHANGELOG
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..3b0bb9f
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,146 @@
+Metadata-Version: 1.0
+Name: proteus
+Version: 1.8.0
+Summary: Library to access Tryton server as a client
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.8/
+Description: proteus
+ =======
+
+ A library to access Tryton's models like a client.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Example of usage
+ ----------------
+
+ >>> from proteus import config, Model, Wizard
+
+ Creating a database
+ ~~~~~~~~~~~~~~~~~~~
+
+ Configuration to connect to a sqlite memory database using trytond as module.
+
+ >>> config = config.set_trytond(':memory:', database_type='sqlite')
+
+ When connecting to a database that doesn't exist, Proteus will create it.
+
+ Installing a module
+ ~~~~~~~~~~~~~~~~~~~
+
+ Find the module, call the install button and run the install wizard.
+
+ >>> Module = Model.get('ir.module.module')
+ >>> (party,) = Module.find([('name', '=', 'party')])
+ >>> Module.button_install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('start')
+
+ Creating a party
+ ~~~~~~~~~~~~~~~~
+
+ First instanciate a new Party:
+
+ >>> Party = Model.get('party.party')
+ >>> party = Party()
+ >>> party.id < 0
+ True
+
+ Fill the fields:
+
+ >>> party.name = 'ham'
+
+ Save the instance into the server:
+
+ >>> party.save()
+ >>> party.name
+ u'ham'
+ >>> party.id > 0
+ True
+
+ Setting the language of the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ The language on party is a `Many2One` relation field. So it requires to get a
+ `Model` instance as value.
+
+ >>> Lang = Model.get('ir.lang')
+ >>> (en,) = Lang.find([('code', '=', 'en_US')])
+ >>> party.lang = en
+ >>> party.save()
+ >>> party.lang.code
+ u'en_US'
+
+ Creating an address for the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Addresses are store on party with a `One2Many` field. So the new address just
+ needs to be appended to the list `addresses`.
+
+ >>> Address = Model.get('party.address')
+ >>> address = Address()
+ >>> party.addresses.append(address)
+ >>> party.save()
+ >>> party.addresses #doctest: +ELLIPSIS
+ [proteus.Model.get('party.address')(...)]
+
+ Adding category to the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Categories are linked to party with a `Many2Many` field.
+
+ So first create a category
+
+ >>> Category = Model.get('party.category')
+ >>> category = Category()
+ >>> category.name = 'spam'
+ >>> category.save()
+
+ Append it to categories of the party
+
+ >>> party.categories.append(category)
+ >>> party.save()
+ >>> party.categories #doctest: +ELLIPSIS
+ [proteus.Model.get('party.category')(...)]
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..b4a4955
--- /dev/null
+++ b/README
@@ -0,0 +1,126 @@
+proteus
+=======
+
+A library to access Tryton's models like a client.
+
+Installing
+----------
+
+See INSTALL
+
+Example of usage
+----------------
+
+ >>> from proteus import config, Model, Wizard
+
+Creating a database
+~~~~~~~~~~~~~~~~~~~
+
+Configuration to connect to a sqlite memory database using trytond as module.
+
+ >>> config = config.set_trytond(':memory:', database_type='sqlite')
+
+When connecting to a database that doesn't exist, Proteus will create it.
+
+Installing a module
+~~~~~~~~~~~~~~~~~~~
+
+Find the module, call the install button and run the install wizard.
+
+ >>> Module = Model.get('ir.module.module')
+ >>> (party,) = Module.find([('name', '=', 'party')])
+ >>> Module.button_install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('start')
+
+Creating a party
+~~~~~~~~~~~~~~~~
+
+First instanciate a new Party:
+
+ >>> Party = Model.get('party.party')
+ >>> party = Party()
+ >>> party.id < 0
+ True
+
+Fill the fields:
+
+ >>> party.name = 'ham'
+
+Save the instance into the server:
+
+ >>> party.save()
+ >>> party.name
+ u'ham'
+ >>> party.id > 0
+ True
+
+Setting the language of the party
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The language on party is a `Many2One` relation field. So it requires to get a
+`Model` instance as value.
+
+ >>> Lang = Model.get('ir.lang')
+ >>> (en,) = Lang.find([('code', '=', 'en_US')])
+ >>> party.lang = en
+ >>> party.save()
+ >>> party.lang.code
+ u'en_US'
+
+Creating an address for the party
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Addresses are store on party with a `One2Many` field. So the new address just
+needs to be appended to the list `addresses`.
+
+ >>> Address = Model.get('party.address')
+ >>> address = Address()
+ >>> party.addresses.append(address)
+ >>> party.save()
+ >>> party.addresses #doctest: +ELLIPSIS
+ [proteus.Model.get('party.address')(...)]
+
+Adding category to the party
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Categories are linked to party with a `Many2Many` field.
+
+So first create a category
+
+ >>> Category = Model.get('party.category')
+ >>> category = Category()
+ >>> category.name = 'spam'
+ >>> category.save()
+
+Append it to categories of the party
+
+ >>> party.categories.append(category)
+ >>> party.save()
+ >>> party.categories #doctest: +ELLIPSIS
+ [proteus.Model.get('party.category')(...)]
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..18b6b24
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a2c2a44
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-proteus (1.8.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 15 Jan 2011 15:16:31 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..554bedb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: tryton-proteus
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at m9s.biz>
+Dm-Upload-Allowed: yes
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Standards-Version: 3.9.1
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-proteus.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-proteus.git
+
+Package: tryton-proteus
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, python-simplejson, python-pkg-resources
+Suggests: tryton-server
+Description: Tryton Application Platform (Proteus)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This package contains Proteus, a library to access a Tryton server as a
+ client. This library can access Tryton's models by connecting to a Tryton
+ server via XML-RPC or by using trytond as a module.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d242681
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 2010 Cedric Krier
+ (C) 2010 B2CK SPRL
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/manpages/proteus.1 b/debian/manpages/proteus.1
new file mode 100644
index 0000000..efe040e
--- /dev/null
+++ b/debian/manpages/proteus.1
@@ -0,0 +1,24 @@
+.TH PROTEUS 1 "2011\-01\-15" "1.8" "Tryton Application Platform"
+
+.SH NAME
+proteus \- Tryton Application Platform (Proteus)
+
+.SH SYNOPSIS
+\fBtryton\fR
+
+.SH DESCRIPTION
+Tryton is a high-level general purpose application platform written in Python and using PostgreSQL as database engine. It is the core base of an ERP.
+
+.SH OPTIONS
+\fBproteus\fR has no options.
+
+.SH SEE ALSO
+\fItrytond\fR(8)
+
+.SH HOMEPAGE
+More information about Tryton Proteus and the Tryton project can be found at <\fIhttp://www.tryton.org/\fR>.
+
+.SH AUTHOR
+Tryton proteus was written by the Tryton project <\fIhttp://www.tryton.org/\fR>.
+.PP
+This manual page was written by Mathias Behrle <\fImathiasb at m9s.biz\fR>, for the Debian project (but may be used by others).
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..b3dc41e
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/tryton-proteus.examples b/debian/tryton-proteus.examples
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/tryton-proteus.examples
@@ -0,0 +1 @@
+README
diff --git a/debian/tryton-proteus.manpages b/debian/tryton-proteus.manpages
new file mode 100644
index 0000000..2fb19fb
--- /dev/null
+++ b/debian/tryton-proteus.manpages
@@ -0,0 +1 @@
+debian/manpages/*
diff --git a/debian/tryton.proteus.links b/debian/tryton.proteus.links
new file mode 100644
index 0000000..32b9a52
--- /dev/null
+++ b/debian/tryton.proteus.links
@@ -0,0 +1,2 @@
+/usr/bin/proteus /usr/bin/tryton-proteus
+/usr/share/man/man1/proteus.1.gz /usr/share/man/man1/tryton-proteus.1.gz
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
new file mode 100644
index 0000000..3b0bb9f
--- /dev/null
+++ b/proteus.egg-info/PKG-INFO
@@ -0,0 +1,146 @@
+Metadata-Version: 1.0
+Name: proteus
+Version: 1.8.0
+Summary: Library to access Tryton server as a client
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.8/
+Description: proteus
+ =======
+
+ A library to access Tryton's models like a client.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Example of usage
+ ----------------
+
+ >>> from proteus import config, Model, Wizard
+
+ Creating a database
+ ~~~~~~~~~~~~~~~~~~~
+
+ Configuration to connect to a sqlite memory database using trytond as module.
+
+ >>> config = config.set_trytond(':memory:', database_type='sqlite')
+
+ When connecting to a database that doesn't exist, Proteus will create it.
+
+ Installing a module
+ ~~~~~~~~~~~~~~~~~~~
+
+ Find the module, call the install button and run the install wizard.
+
+ >>> Module = Model.get('ir.module.module')
+ >>> (party,) = Module.find([('name', '=', 'party')])
+ >>> Module.button_install([party.id], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('start')
+
+ Creating a party
+ ~~~~~~~~~~~~~~~~
+
+ First instanciate a new Party:
+
+ >>> Party = Model.get('party.party')
+ >>> party = Party()
+ >>> party.id < 0
+ True
+
+ Fill the fields:
+
+ >>> party.name = 'ham'
+
+ Save the instance into the server:
+
+ >>> party.save()
+ >>> party.name
+ u'ham'
+ >>> party.id > 0
+ True
+
+ Setting the language of the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ The language on party is a `Many2One` relation field. So it requires to get a
+ `Model` instance as value.
+
+ >>> Lang = Model.get('ir.lang')
+ >>> (en,) = Lang.find([('code', '=', 'en_US')])
+ >>> party.lang = en
+ >>> party.save()
+ >>> party.lang.code
+ u'en_US'
+
+ Creating an address for the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Addresses are store on party with a `One2Many` field. So the new address just
+ needs to be appended to the list `addresses`.
+
+ >>> Address = Model.get('party.address')
+ >>> address = Address()
+ >>> party.addresses.append(address)
+ >>> party.save()
+ >>> party.addresses #doctest: +ELLIPSIS
+ [proteus.Model.get('party.address')(...)]
+
+ Adding category to the party
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Categories are linked to party with a `Many2Many` field.
+
+ So first create a category
+
+ >>> Category = Model.get('party.category')
+ >>> category = Category()
+ >>> category.name = 'spam'
+ >>> category.save()
+
+ Append it to categories of the party
+
+ >>> party.categories.append(category)
+ >>> party.save()
+ >>> party.categories #doctest: +ELLIPSIS
+ [proteus.Model.get('party.category')(...)]
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/proteus.egg-info/SOURCES.txt b/proteus.egg-info/SOURCES.txt
new file mode 100644
index 0000000..c415452
--- /dev/null
+++ b/proteus.egg-info/SOURCES.txt
@@ -0,0 +1,19 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+setup.py
+proteus/__init__.py
+proteus/config.py
+proteus/pyson.py
+proteus.egg-info/PKG-INFO
+proteus.egg-info/SOURCES.txt
+proteus.egg-info/dependency_links.txt
+proteus.egg-info/requires.txt
+proteus.egg-info/top_level.txt
+proteus/tests/__init__.py
+proteus/tests/test_config.py
+proteus/tests/test_model.py
+proteus/tests/test_wizard.py
\ No newline at end of file
diff --git a/proteus.egg-info/dependency_links.txt b/proteus.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/proteus.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
new file mode 100644
index 0000000..275aecc
--- /dev/null
+++ b/proteus.egg-info/requires.txt
@@ -0,0 +1,4 @@
+
+
+[trytond]
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/proteus.egg-info/top_level.txt b/proteus.egg-info/top_level.txt
new file mode 100644
index 0000000..aa36ae0
--- /dev/null
+++ b/proteus.egg-info/top_level.txt
@@ -0,0 +1 @@
+proteus
diff --git a/proteus/__init__.py b/proteus/__init__.py
new file mode 100644
index 0000000..aff60a8
--- /dev/null
+++ b/proteus/__init__.py
@@ -0,0 +1,803 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+'''
+A library to access Tryton's models like a client.
+'''
+__version__ = "1.8.0"
+__all__ = ['Model', 'Wizard']
+from types import NoneType
+import threading
+import datetime
+from decimal import Decimal
+import proteus.config
+from proteus.pyson import PYSONDecoder
+
+_MODELS = threading.local()
+
+class _EvalEnvironment(dict):
+ 'Dictionary for evaluation'
+ def __init__(self, parent):
+ super(_EvalEnvironment, self).__init__()
+ self.parent = parent
+
+ def __getitem__(self, item):
+ if item == '_parent_' + self.parent._parent_field_name \
+ and self.parent.parent:
+ return _EvalEnvironment(self.parent.parent)
+ return self.parent._get_eval()[item]
+
+ def __getattr__(self, item):
+ return self.__getitem__(item)
+
+ def get(self, item, default=None):
+ try:
+ return self.__getattr__(item)
+ except:
+ pass
+ return super(_EvalEnvironment, self).get(item, default)
+
+ def __nonzero__(self):
+ return True
+
+ def __str__(self):
+ return str(self.parent)
+
+ __repr__ = __str__
+
+ def __contains__(self, item):
+ return item in self.parent._fields
+
+
+class FieldDescriptor(object):
+ default = None
+
+ def __init__(self, name, definition):
+ super(FieldDescriptor, self).__init__()
+ self.name = name
+ self.definition = definition
+
+ def __get__(self, instance, owner):
+ if instance.id > 0 and self.name not in instance._values:
+ instance._read(self.name)
+ return instance._values.get(self.name, self.default)
+
+ def __set__(self, instance, value):
+ if instance.id > 0 and self.name not in instance._values:
+ instance._read(self.name)
+ previous = getattr(instance, self.name)
+ instance._values[self.name] = value
+ if previous != getattr(instance, self.name):
+ instance._changed.add(self.name)
+ instance._on_change(self.name)
+ if instance._parent:
+ instance._parent._changed.add(instance._parent_field_name)
+ instance._parent._on_change(instance._parent_field_name)
+
+
+class BooleanDescriptor(FieldDescriptor):
+ default = False
+
+ def __set__(self, instance, value):
+ assert isinstance(value, bool)
+ super(BooleanDescriptor, self).__set__(instance, value)
+
+
+class CharDescriptor(FieldDescriptor):
+ default = None
+
+ def __set__(self, instance, value):
+ assert isinstance(value, basestring)
+ super(CharDescriptor, self).__set__(instance, value)
+
+
+class IntegerDescriptor(FieldDescriptor):
+ default = 0
+
+ def __set__(self, instance, value):
+ assert isinstance(value, (int, long))
+ super(IntegerDescriptor, self).__set__(instance, value)
+
+
+class FloatDescriptor(FieldDescriptor):
+ default = 0.0
+
+ def __set__(self, instance, value):
+ assert isinstance(value, float)
+ super(FloatDescriptor, self).__set__(instance, value)
+
+
+class NumericDescriptor(FieldDescriptor):
+ default = Decimal('0.0')
+
+ def __set__(self, instance, value):
+ assert isinstance(value, Decimal)
+ # TODO add digits validation
+ super(NumericDescriptor, self).__set__(instance, value)
+
+
+class ReferenceDescriptor(FieldDescriptor):
+ def __get__(self, instance, owner):
+ value = super(ReferenceDescriptor, self).__get__(instance, owner)
+ if isinstance(value, basestring):
+ model_name, id = value.split(',', 1)
+ if model_name:
+ relation = Model.get(model_name, instance._config)
+ value = relation(int(id))
+ instance._values[self.name] = value
+ return value
+
+ def __set__(self, instance, value):
+ assert isinstance(value, (Model, NoneType, basestring))
+ if isinstance(value, basestring):
+ assert value.startswith(',')
+ elif isinstance(value, Model):
+ assert value.id > 0 and not value._changed
+ assert value._config == instance._config
+ super(ReferenceDescriptor, self).__set__(instance, value)
+
+
+class DateDescriptor(FieldDescriptor):
+ def __get__(self, instance, owner):
+ value = super(DateDescriptor, self).__get__(instance, owner)
+ if isinstance(value, datetime.datetime):
+ value = value.date()
+ instance._values[self.name] = value
+ return value
+
+ def __set__(self, instance, value):
+ assert isinstance(value, datetime.date)
+ super(DateDescriptor, self).__set__(instance, value)
+
+
+class DateTimeDescriptor(FieldDescriptor):
+ def __set__(self, instance, value):
+ assert isinstance(value, datetime.datetime)
+ super(DateTimeDescriptor, self).__set_(instance, value)
+
+
+class Many2OneDescriptor(FieldDescriptor):
+ def __get__(self, instance, owner):
+ relation = Model.get(self.definition['relation'], instance._config)
+ value = super(Many2OneDescriptor, self).__get__(instance, owner)
+ if isinstance(value, (int, long)) and value is not False:
+ value = relation(value)
+ elif not value:
+ value = None
+ instance._values[self.name] = value
+ return value
+
+ def __set__(self, instance, value):
+ assert isinstance(value, (Model, NoneType))
+ if value:
+ assert value.id > 0 and not value._changed
+ assert value._config == instance._config
+ super(Many2OneDescriptor, self).__set__(instance, value)
+
+
+class One2ManyDescriptor(FieldDescriptor):
+ default = []
+
+ def __get__(self, instance, owner):
+ relation = Model.get(self.definition['relation'], instance._config)
+ value = super(One2ManyDescriptor, self).__get__(instance, owner)
+ if not isinstance(value, ModelList):
+ value = ModelList((relation(id)
+ for id in value or []), instance, self.name,
+ self.definition.get('relation_field'))
+ instance._values[self.name] = value
+ return value
+
+ def __set__(self, instance, value):
+ raise AttributeError
+
+
+class Many2ManyDescriptor(One2ManyDescriptor):
+ pass
+
+
+class ValueDescriptor(object):
+ def __init__(self, name, definition):
+ super(ValueDescriptor, self).__init__()
+ self.name = name
+ self.definition = definition
+
+ def __get__(self, instance, owner):
+ return getattr(instance, self.name)
+
+
+class ReferenceValueDescriptor(ValueDescriptor):
+ def __get__(self, instance, owner):
+ value = super(ReferenceValueDescriptor, self).__get__(instance, owner)
+ if isinstance(value, Model):
+ value = '%s,%s' % (value.__class__.__name__, value.id)
+ return value or False
+
+
+class Many2OneValueDescriptor(ValueDescriptor):
+ def __get__(self, instance, owner):
+ value = super(Many2OneValueDescriptor, self).__get__(instance, owner)
+ return value and value.id or False
+
+
+class One2ManyValueDescriptor(ValueDescriptor):
+ def __get__(self, instance, owner):
+ value = [('add', [])]
+ value_list = getattr(instance, self.name)
+ for record in value_list:
+ if record.id > 0:
+ if record._changed:
+ value.append(('write', record.id, record._get_values(
+ fields=record._changed)))
+ value[0][1].append(record.id)
+ else:
+ value.append(('create', record._get_values(
+ fields=record._changed)))
+ if value_list.record_removed:
+ value.append(('unlink', [x.id for x in value_list.record_removed]))
+ if value_list.record_deleted:
+ value.append(('delete', [x.id for x in value_list.record_deleted]))
+ return value
+
+
+class Many2ManyValueDescriptor(One2ManyValueDescriptor):
+ pass
+
+
+class EvalDescriptor(object):
+ def __init__(self, name, definition):
+ super(EvalDescriptor, self).__init__()
+ self.name = name
+ self.definition = definition
+
+ def __get__(self, instance, owner):
+ return getattr(instance, self.name)
+
+
+class ReferenceEvalDescriptor(EvalDescriptor):
+ def __get__(self, instance, owner):
+ value = super(ReferenceEvalDescriptor, self).__get__(instance, owner)
+ if isinstance(value, Model):
+ value = '%s,%s' % (value.__class__.__name__, value.id)
+ return value or False
+
+
+class Many2OneEvalDescriptor(EvalDescriptor):
+ def __get__(self, instance, owner):
+ value = super(Many2OneEvalDescriptor, self).__get__(instance, owner)
+ if value:
+ return value.id
+ return False
+
+
+class One2ManyEvalDescriptor(EvalDescriptor):
+ def __get__(self, instance, owner):
+ return [x.id for x in getattr(instance, self.name)]
+
+
+class Many2ManyEvalDescriptor(One2ManyEvalDescriptor):
+ pass
+
+
+class MetaModelFactory(object):
+ descriptors = {
+ 'boolean': BooleanDescriptor,
+ 'char': CharDescriptor,
+ 'text': CharDescriptor,
+ 'sha': CharDescriptor,
+ 'binary': CharDescriptor,
+ 'selection': CharDescriptor, # TODO implement its own descriptor
+ 'integer': IntegerDescriptor,
+ 'biginteger': IntegerDescriptor,
+ 'float': FloatDescriptor,
+ 'float_time': FloatDescriptor,
+ 'numeric': NumericDescriptor,
+ 'reference': ReferenceDescriptor,
+ 'date': DateDescriptor,
+ 'datetime': DateTimeDescriptor,
+ 'many2one': Many2OneDescriptor,
+ 'one2many': One2ManyDescriptor,
+ 'many2many': Many2ManyDescriptor,
+ }
+ value_descriptors = {
+ 'reference': ReferenceValueDescriptor,
+ 'many2one': Many2OneValueDescriptor,
+ 'one2many': One2ManyValueDescriptor,
+ 'many2many': Many2ManyValueDescriptor,
+ }
+ eval_descriptors = {
+ 'reference': ReferenceEvalDescriptor,
+ 'many2one': Many2OneEvalDescriptor,
+ 'one2many': One2ManyEvalDescriptor,
+ 'many2many': Many2ManyEvalDescriptor,
+ }
+
+ def __init__(self, model_name, config=None):
+ super(MetaModelFactory, self).__init__()
+ self.model_name = model_name
+ self.config = config or proteus.config.get_config()
+
+ def __call__(self):
+ models_key = 'c%s' % id(self.config)
+ if not hasattr(_MODELS, models_key):
+ setattr(_MODELS, models_key, {})
+ class MetaModel(type):
+ 'Meta class for Model'
+ def __new__(mcs, name, bases, dict):
+ if self.model_name in getattr(_MODELS, models_key):
+ return getattr(_MODELS, models_key)[self.model_name]
+ proxy = self.config.get_proxy(self.model_name)
+ context = self.config.context
+ name = self.model_name
+ dict['_proxy'] = proxy
+ dict['_config'] = self.config
+ dict['_fields'] = proxy.fields_get(None, context)
+ for field_name, definition in dict['_fields'].iteritems():
+ if field_name == 'id':
+ continue
+ Descriptor = self.descriptors[definition['type']]
+ dict[field_name] = Descriptor(field_name, definition)
+ VDescriptor = self.value_descriptors.get(
+ definition['type'], ValueDescriptor)
+ dict['__%s_value' % field_name] = VDescriptor(
+ field_name, definition)
+ EDescriptor = self.eval_descriptors.get(
+ definition['type'], EvalDescriptor)
+ dict['__%s_eval' % field_name] = EDescriptor(
+ field_name, definition)
+ for method in self.config.get_proxy_methods(self.model_name):
+ setattr(mcs, method, getattr(proxy, method))
+ res = type.__new__(mcs, name, bases, dict)
+ getattr(_MODELS, models_key)[self.model_name] = res
+ return res
+ __new__.__doc__ = type.__new__.__doc__
+ return MetaModel
+
+
+class ModelList(list):
+ 'List for Model'
+
+ def __init__(self, sequence=None, parent=None, parent_field_name='',
+ parent_name=''):
+ if sequence is None:
+ sequence = []
+ self.parent = parent
+ if parent:
+ assert parent_field_name
+ self.parent_field_name = parent_field_name
+ self.parent_name = parent_name
+ self.record_removed = set()
+ self.record_deleted = set()
+ result = super(ModelList, self).__init__(sequence)
+ for record in self:
+ record._parent = parent
+ record._parent_field_name = parent_field_name
+ record._parent_name = parent_name
+ return result
+ __init__.__doc__ = list.__init__.__doc__
+
+ def _changed(self):
+ 'Signal change to parent'
+ if self.parent:
+ self.parent._changed.add(self.parent_field_name)
+ self.parent._on_change(self.parent_field_name)
+
+ def append(self, record):
+ assert isinstance(record, Model)
+ if self.parent:
+ assert record._config == self.parent._config
+ elif self:
+ assert record._config == self[0]._config
+ assert record._parent is None
+ assert not record._parent_field_name
+ assert not record._parent_name
+ record._parent = self.parent
+ record._parent_field_name = self.parent_field_name
+ record._parent_name = self.parent_name
+ res = super(ModelList, self).append(record)
+ self._changed()
+ return res
+ append.__doc__ = list.append.__doc__
+
+ def extend(self, iterable):
+ iterable = list(iterable)
+ config = None
+ for record in iterable:
+ assert isinstance(record, Model)
+ if self.parent:
+ assert record._config == self.parent._config
+ elif self:
+ assert record._config == self[0]._config
+ elif config:
+ assert record._config == config
+ else:
+ config = record._config
+ for record in iterable:
+ assert record._parent is None
+ assert not record._parent_field_name
+ assert not record._parent_name
+ record._parent = self.parent
+ record._parent_field_name = self.parent_field_name
+ record._parent_name = self.parent_name
+ res = super(ModelList, self).extend(iterable)
+ self._changed()
+ return res
+ extend.__doc__ = list.extend.__doc__
+
+ def insert(self, index, record):
+ raise NotImplementedError
+ insert.__doc__ = list.insert.__doc__
+
+ def pop(self, index=-1):
+ self.record_removed.add(self[index])
+ self[index]._parent = None
+ self[index]._parent_field_name = None
+ self[index]._parent_name = None
+ res = super(ModelList, self).pop(index)
+ self._changed()
+ return res
+ pop.__doc__ = list.pop.__doc__
+
+ def remove(self, record):
+ self.record_deleted.add(record)
+ record._parent = None
+ record._parent_field_name = None
+ record._parent_name = None
+ res = super(ModelList, self).remove(record)
+ self._changed()
+ return res
+ remove.__doc__ = list.remove.__doc__
+
+ def reverse(self):
+ raise NotImplementedError
+ reverse.__doc__ = list.reverse.__doc__
+
+ def sort(self):
+ raise NotImplementedError
+ sort.__doc__ = list.sort.__doc__
+
+
+class Model(object):
+ 'Model class for Tryton records'
+
+ __counter = -1
+ _proxy = None
+ _config = None
+ _fields = None
+
+ def __init__(self, id=None, **kwargs):
+ super(Model, self).__init__()
+ if id:
+ assert not kwargs
+ self.__id = id or Model.__counter
+ if self.__id < 0:
+ Model.__counter -= 1
+ self._values = {} # store the values of fields
+ self._changed = set() # store the changed fields
+ self._parent = None # store the parent record
+ self._parent_field_name = '' # store the field name in parent record
+ self._parent_name = '' # store the field name to parent record
+ if self.id < 0:
+ self._default_get()
+
+ for field_name, value in kwargs.iteritems():
+ 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]
+ getattr(self, field_name).extend(value)
+ else:
+ if (definition['type'] == 'many2one'
+ and isinstance(value, (int, long))):
+ relation = Model.get(definition['relation'])
+ value = relation(value)
+ setattr(self, field_name, value)
+ __init__.__doc__ = object.__init__.__doc__
+
+ @classmethod
+ def get(cls, name, config=None):
+ 'Get a class for the named Model'
+ class Spam(Model):
+ __metaclass__ = MetaModelFactory(name, config=config)()
+ return Spam
+
+ @classmethod
+ def reset(cls, config=None, *names):
+ 'Reset class definition for Models named'
+ config = config or proteus.config.get_config()
+ models_key = 'c%s' % id(config)
+ if not names:
+ setattr(_MODELS, models_key, {})
+ else:
+ models = getattr(_MODELS, models_key, {})
+ for name in names:
+ del models[name]
+
+ def __str__(self):
+ return '<%s(%d)>' % (self.__class__.__name__, self.id)
+ __str__.__doc__ = object.__str__.__doc__
+
+ def __repr__(self):
+ if self._config == proteus.config.get_config():
+ return "proteus.Model.get('%s')(%d)" % (self.__class__.__name__,
+ self.id)
+ return "proteus.Model.get('%s', %s)(%d)" % (self.__class__.__name__,
+ repr(self._config), self.id)
+ __repr__.__doc__ = object.__repr__.__doc__
+
+ def __cmp__(self, other):
+ 'Compare with other'
+ if isinstance(other, Model):
+ return cmp(self.id, other.id)
+ if isinstance(other, (bool, NoneType)):
+ return 1
+ raise NotImplementedError
+
+ @property
+ def id(self):
+ 'The unique ID'
+ return self.__id
+
+ @classmethod
+ def find(cls, condition=None, offset=0, limit=None, order=None):
+ 'Return records matching condition'
+ if condition is None:
+ condition = []
+ ids = cls._proxy.search(condition, offset, limit, order,
+ cls._config.context)
+ return [cls(id) for id in ids]
+
+ def reload(self):
+ 'Reload record'
+ self._values = {}
+ self._changed = set()
+
+ def save(self):
+ 'Save the record'
+ context = self._config.context
+ if self.id < 0:
+ values = self._get_values(fields=self._changed)
+ self.__id = self._proxy.create(values, context)
+ else:
+ if not self._changed:
+ return
+ values = self._get_values(fields=self._changed)
+ context['_timestamp'] = self._get_timestamp()
+ self._proxy.write(self.id, values, context)
+ self.reload()
+
+ def delete(self):
+ 'Delete the record'
+ if self.id > 0:
+ context = self._config.context
+ context['_timestamp'] = self._get_timestamp()
+ return self._proxy.delete(self.id, context)
+ self.reload()
+ return True
+
+ def _get_values(self, fields=None):
+ 'Return dictionary values'
+ if fields is None:
+ fields = self._values.keys()
+ return dict((x, getattr(self, '__%s_value' % x)) for x in fields
+ if x not in ('id', '_timestamp'))
+
+ @property
+ def _timestamp(self):
+ 'Get _timestamp'
+ return self._values.get('_timestamp')
+
+ def _get_timestamp(self):
+ 'Return dictionary with timestamps'
+ result = {'%s,%s' % (self.__class__.__name__, self.id):
+ self._timestamp}
+ for field, definition in self._fields.iteritems():
+ if field not in self._values:
+ continue
+ if definition['type'] in ('one2many', 'many2many'):
+ for record in getattr(self, field):
+ result.update(record._get_timestamp())
+ return result
+
+ def _read(self, name):
+ 'Read field'
+ fields = []
+ if not self._values:
+ fields = [x for x, y in self._fields.iteritems()
+ if y['type'] not in ('one2many', 'many2many', 'binary')]
+ fields.append('_timestamp')
+ fields.append(name)
+ self._values.update(self._proxy.read(self.id, fields,
+ self._config.context))
+
+ def _default_get(self):
+ 'Set default values'
+ fields = self._fields.keys()
+ self._default_set(self._proxy.default_get(fields, False,
+ self._config.context))
+
+ def _default_set(self, values):
+ for field, value in values.iteritems():
+ definition = self._fields[field]
+ if definition['type'] in ('one2many', 'many2many'):
+ if value and len(value) and isinstance(value[0], (int, long)):
+ self._values[field] = value
+ continue
+ relation = Model.get(definition['relation'], self._config)
+ records = []
+ for vals in (value or []):
+ record = relation()
+ record._default_set(vals)
+ records.append(record)
+ self._values[field] = ModelList(records, self, field,
+ definition.get('relation_field', ''))
+ else:
+ self._values[field] = value
+
+ def _get_eval(self):
+ values = dict((x, getattr(self, '__%s_eval' % x))
+ for x in self._fields if x != 'id')
+ values['id'] = self.id
+ return values
+
+ def _on_change_args(self, args):
+ res = {}
+ values = self._get_eval()
+ del values['id']
+ for field, definition in self._fields.iteritems():
+ if definition['type'] in ('one2many', 'many2many'):
+ values[field] = [x._get_eval() for x in getattr(self, field)]
+ if self._parent:
+ values['_parent_%s' % self._parent_name] = \
+ _EvalEnvironment(self._parent)
+ for arg in args:
+ scope = values
+ for i in arg.split('.'):
+ if i not in scope:
+ scope = False
+ break
+ scope = scope[i]
+ res[arg] = scope
+ return res
+
+ def _on_change_set(self, field, value):
+ if self._fields[field]['type'] in ('one2many', 'many2many'):
+ if isinstance(value, (list, tuple)):
+ self._values[field] = value
+ self._changed.add(field)
+ return
+ to_remove = []
+ if value and value.get('remove'):
+ for record_id in value['remove']:
+ for record in getattr(self, field):
+ if record.id == record_id:
+ to_remove.append(record)
+ for record in to_remove:
+ # remove without signal
+ list.remove(getattr(self, field), record)
+ if value and value.get('add') or value.get('update'):
+ for vals in value.get('add', []):
+ relation = Model.get(self._fields[field]['relation'],
+ self._config)
+ # append without signal
+ list.append(getattr(self, field), relation(**vals))
+ for vals in value.get('update', []):
+ if 'id' not in vals:
+ continue
+ for record in getattr(self, field):
+ if record.id == vals['id']:
+ for i, j in vals.iteritems():
+ record._values[i] = j
+ record._changed.add(i)
+ else:
+ self._values[field] = value
+ self._changed.add(field)
+
+ def _on_change(self, name):
+ 'Call on_change for field'
+ definition = self._fields[name]
+ if definition.get('on_change'):
+ if isinstance(definition['on_change'], basestring):
+ definition['on_change'] = PYSONDecoder().decode(
+ definition['on_change'])
+ args = self._on_change_args(definition['on_change'])
+ context = self._config.context
+ res = getattr(self._proxy, 'on_change_%s' % name)(args, context)
+ later = {}
+ for field, value in res.iteritems():
+ if field not in self._fields:
+ continue
+ if self._fields[field]['type'] in ('one2many', 'many2many'):
+ later[field] = value
+ continue
+ self._on_change_set(field, value)
+ for field, value in later.iteritems():
+ self._on_change_set(field, value)
+ if self._parent:
+ self._parent._changed.add(self._parent_field_name)
+ if definition.get('change_default'):
+ context = self._config.context
+ default = Model.get('ir.default', config=self._config)
+ self._default_set(default.get_default(self.__class__.__name__,
+ '%s=%s' % (name, self._get_values([name])[name]), context))
+ for field, definition in self._fields.iteritems():
+ if not definition.get('on_change_with'):
+ continue
+ if name not in definition['on_change_with']:
+ continue
+ if field == name:
+ continue
+ args = self._on_change_args(definition['on_change_with'])
+ context = self._config.context
+ res = getattr(self._proxy, 'on_change_with_%s' % field)(args,
+ context)
+ self._on_change_set(field, res)
+
+
+class Wizard(object):
+ 'Wizard class for Tryton wizards'
+
+ def __init__(self, name, models=None, config=None, context=None):
+ if models:
+ assert len(set(type(x) for x in models)) == 1
+ super(Wizard, self).__init__()
+ self.name = name
+ self.state = None
+ self.states = ['init']
+ self.form = None
+ self._config = config or proteus.config.get_config()
+ self._context = context or {}
+ self._proxy = self._config.get_proxy(name, type='wizard')
+ self.id = self._proxy.create(self._config.context)
+ if models:
+ self.datas = {
+ 'model': models[0].__class__.__name__,
+ 'id': models[0].id,
+ 'ids': [model.id for model in models]
+ }
+ else:
+ self.datas = {}
+ self.execute('init')
+
+ def execute(self, state):
+ assert state in self.states
+
+ if 'form' not in self.datas:
+ self.datas['form'] = {}
+
+ if self.form:
+ self.datas['form'].update(self.form._get_values())
+
+ self.state = state
+ while self.state != 'end':
+ ctx = self._context.copy()
+ ctx.update(self._config.context)
+ ctx['active_id'] = self.datas.get('id')
+ ctx['active_ids'] = self.datas.get('ids')
+
+ res = self._proxy.execute(self.id, self.datas, self.state, ctx)
+ if not res:
+ break
+
+ if 'datas' in res:
+ self.datas['form'] = res['datas']
+ elif res['type'] == 'form':
+ self.datas['form'] = {}
+
+ if res['type'] == 'form':
+ self.states = [x[0] for x in res['state']]
+ # XXX set context
+ self.form = Model.get(res['object'])()
+ self.form._default_set(self.datas['form'])
+ return
+ elif res['type'] == 'action':
+ # TODO run action
+ self.state = res['state']
+ elif res['type'] == 'print':
+ # TODO run print
+ self.state = res['state']
+ elif res['type'] == 'state':
+ self.state = res['state']
+
+ if self.state == 'end':
+ self._proxy.delete(self.id, self._config.context)
diff --git a/proteus/config.py b/proteus/config.py
new file mode 100644
index 0000000..6a7b2a6
--- /dev/null
+++ b/proteus/config.py
@@ -0,0 +1,209 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"""
+Configuration functions for the proteus package for Tryton.
+"""
+from __future__ import with_statement
+__all__ = ['set_trytond', 'set_xmlrpc', 'get_config']
+import xmlrpclib
+import threading
+from decimal import Decimal
+from types import NoneType
+import datetime
+
+def dump_decimal(self, value, write):
+ write("<value><double>")
+ write(str(value))
+ write("</double></value>\n")
+
+xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
+xmlrpclib.Marshaller.dispatch[datetime.date] = \
+ lambda self, value, write: self.dump_datetime(
+ datetime.datetime.combine(value, datetime.time()), write)
+
+_CONFIG = threading.local()
+
+
+class Config(object):
+ 'Config interface'
+
+ def __init__(self):
+ super(Config, self).__init__()
+ self._context = {}
+
+ @property
+ def context(self):
+ return self._context.copy()
+
+ def get_proxy(self, name):
+ raise NotImplementedError
+
+ def get_proxy_methods(self, name):
+ raise NotImplementedError
+
+ def __eq__(self, other):
+ if isinstance(other, Config):
+ return repr(self) == repr(other)
+ return NotImplemented
+
+
+class _TrytondMethod(object):
+
+ def __init__(self, name, model, config):
+ super(_TrytondMethod, self).__init__()
+ self._name = name
+ self._object = model
+ self._config = config
+
+ def __call__(self, *args):
+ from trytond.cache import Cache
+ from trytond.transaction import Transaction
+
+ assert self._name in self._object._rpc
+
+ with Transaction().start(self._config.database_name,
+ self._config.user) as transaction:
+ Cache.clean(self._config.database_name)
+ args = list(args)
+ context = args.pop()
+ if '_timestamp' in context:
+ transaction.timestamp = context['_timestamp']
+ del context['_timestamp']
+ transaction.context = context
+ res = getattr(self._object, self._name)(*args)
+ if self._object._rpc[self._name]:
+ transaction.cursor.commit()
+ Cache.resets(self._config.database_name)
+ return res
+
+class TrytondProxy(object):
+ 'Proxy for function call for trytond'
+
+ def __init__(self, name, config, type='model'):
+ super(TrytondProxy, self).__init__()
+ self._config = config
+ self._object = config.pool.get(name, type=type)
+ __init__.__doc__ = object.__init__.__doc__
+
+ def __getattr__(self, name):
+ 'Return attribute value'
+ return _TrytondMethod(name, self._object, self._config)
+
+
+class TrytondConfig(Config):
+ 'Configuration for trytond'
+
+ def __init__(self, database_name, user, database_type, language='en_US',
+ password=''):
+ super(TrytondConfig, self).__init__()
+ from trytond.config import CONFIG
+ CONFIG['db_type'] = database_type
+ CONFIG.parse()
+ from trytond.modules import register_classes
+ from trytond.pool import Pool
+ from trytond.backend import Database
+ from trytond.protocols.dispatcher import create
+ from trytond.cache import Cache
+ from trytond.transaction import Transaction
+ self.database_name = database_name
+ self._user = user
+ self.database_type = database_type
+
+ register_classes()
+
+ database = Database().connect()
+ cursor = database.cursor()
+ try:
+ databases = database.list(cursor)
+ finally:
+ cursor.close()
+ if database_name not in databases:
+ create(database_name, CONFIG['admin_passwd'], language, password)
+
+ database_list = Pool.database_list()
+ self.pool = Pool(database_name)
+ if database_name not in database_list:
+ self.pool.init()
+
+ with Transaction().start(self.database_name, 0) as transaction:
+ Cache.clean(database_name)
+ user_obj = self.pool.get('res.user')
+ transaction.context = self.context
+ self.user = user_obj.search([
+ ('login', '=', user),
+ ], limit=1)[0]
+ with transaction.set_user(self.user):
+ self._context = user_obj.get_preferences(context_only=True)
+ Cache.resets(database_name)
+ __init__.__doc__ = object.__init__.__doc__
+
+ def __repr__(self):
+ return "proteus.config.TrytondConfig('%s', '%s', '%s')" % (
+ self.database_name, self._user, self.database_type)
+ __repr__.__doc__ = object.__repr__.__doc__
+
+ def get_proxy(self, name, type='model'):
+ 'Return Proxy class'
+ return TrytondProxy(name, self, type=type)
+
+ def get_proxy_methods(self, name, type='model'):
+ 'Return list of methods'
+ proxy = self.get_proxy(name, type=type)
+ return [x for x in proxy._object._rpc]
+
+def set_trytond(database_name, user='admin', database_type='postgresql',
+ language='en_US', password=''):
+ 'Set trytond package as backend'
+ _CONFIG.current = TrytondConfig(database_name, user, database_type,
+ language=language, password=password)
+ return _CONFIG.current
+
+
+class XmlrpcProxy(object):
+ 'Proxy for function call for XML-RPC'
+
+ def __init__(self, name, config, type='model'):
+ super(XmlrpcProxy, self).__init__()
+ self._config = config
+ self._object = getattr(config.server, '%s.%s' % (type, name))
+ __init__.__doc__ = object.__init__.__doc__
+
+ def __getattr__(self, name):
+ 'Return attribute value'
+ return getattr(self._object, name)
+
+class XmlrpcConfig(Config):
+ 'Configuration for XML-RPC'
+
+ def __init__(self, url):
+ super(XmlrpcConfig, self).__init__()
+ self.url = url
+ self.server = xmlrpclib.ServerProxy(url, allow_none=1, use_datetime=1)
+ # TODO add user
+ self._context = self.server.model.res.user.get_preferences(True, {})
+ __init__.__doc__ = object.__init__.__doc__
+
+ def __repr__(self):
+ return "proteus.config.XmlrpcConfig('%s')" % self.url
+ __repr__.__doc__ = object.__repr__.__doc__
+
+ def get_proxy(self, name, type='model'):
+ 'Return Proxy class'
+ return XmlrpcProxy(name, self, type=type)
+
+ def get_proxy_methods(self, name, type='model'):
+ 'Return list of methods'
+ object_ = '%s.%s' % (type, name)
+ return [x[len(object_) + 1:]
+ for x in self.server.system.listMethods()
+ if x.startswith(object_)
+ and '.' not in x[len(object_) + 1:]]
+
+def set_xmlrpc(url):
+ 'Set XML-RPC as backend'
+ _CONFIG.current = XmlrpcConfig(url)
+ return _CONFIG.current
+
+def get_config():
+ # TODO raise exception if not set
+ return _CONFIG.current
diff --git a/proteus/pyson.py b/proteus/pyson.py
new file mode 100644
index 0000000..5eca3cb
--- /dev/null
+++ b/proteus/pyson.py
@@ -0,0 +1,494 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+__all__ = ['PYSONEncoder', 'PYSONDecoder', 'Eval', 'Not', 'Bool', 'And', 'Or',
+ 'Equal', 'Greater', 'Less', 'If', 'Get', 'In', 'Date', 'DateTime']
+import sys
+if sys.version_info < (2, 6):
+ import simplejson as json
+else:
+ import json
+import datetime
+
+
+class PYSON(object):
+
+ def pyson(self):
+ raise NotImplementedError
+
+ def types(self):
+ raise NotImplementedError
+
+ @staticmethod
+ def eval(dct, context):
+ raise NotImplementedError
+
+
+class PYSONEncoder(json.JSONEncoder):
+
+ def default(self, obj):
+ if isinstance(obj, PYSON):
+ return obj.pyson()
+ elif isinstance(obj, datetime.date):
+ if isinstance(obj, datetime.datetime):
+ return DateTime(obj.year, obj.month, obj.day,
+ obj.hour, obj.minute, obj.second, obj.microsecond
+ ).pyson()
+ else:
+ return Date(obj.year, obj.month, obj.day).pyson()
+ return super(PYSONEncoder, self).default(obj)
+
+
+class PYSONDecoder(json.JSONDecoder):
+
+ def __init__(self, context=None):
+ self.__context = context or {}
+ super(PYSONDecoder, self).__init__(object_hook=self._object_hook)
+
+ def _object_hook(self, dct):
+ if '__class__' in dct:
+ klass = globals().get(dct['__class__'])
+ if klass and hasattr(klass, 'eval'):
+ return klass.eval(dct, self.__context)
+ return dct
+
+
+class Eval(PYSON):
+
+ def __init__(self, value, default=''):
+ super(Eval, self).__init__()
+ self._value = value
+ self._default = default
+
+ def pyson(self):
+ return {
+ '__class__': 'Eval',
+ 'v': self._value,
+ 'd': self._default,
+ }
+
+ def types(self):
+ if isinstance(self._default, PYSON):
+ return self._default.types()
+ else:
+ return set([type(self._default)])
+
+ @staticmethod
+ def eval(dct, context):
+ return context.get(dct['v'], dct['d'])
+
+
+class Not(PYSON):
+
+ def __init__(self, value):
+ super(Not, self).__init__()
+ if isinstance(value, PYSON):
+ assert value.types() == set([bool]), 'value must be boolean'
+ else:
+ assert isinstance(value, bool), 'value must be boolean'
+ self._value = value
+
+ def pyson(self):
+ return {
+ '__class__': 'Not',
+ 'v': self._value,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ return not dct['v']
+
+
+class Bool(PYSON):
+
+ def __init__(self, value):
+ super(Bool, self).__init__()
+ self._value = value
+
+ def pyson(self):
+ return {
+ '__class__': 'Bool',
+ 'v': self._value,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ return bool(dct['v'])
+
+
+class And(PYSON):
+
+ def __init__(self, *statements):
+ super(And, self).__init__()
+ for statement in statements:
+ if isinstance(statement, PYSON):
+ assert statement.types() == set([bool]), \
+ 'statement must be boolean'
+ else:
+ assert isinstance(statement, bool), \
+ 'statement must be boolean'
+ assert len(statements) >= 2, 'must have at least 2 statements'
+ self._statements = statements
+
+ def pyson(self):
+ return {
+ '__class__': 'And',
+ 's': self._statements,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ return bool(reduce(lambda x, y: x and y, dct['s']))
+
+
+class Or(And):
+
+ def pyson(self):
+ res = super(Or, self).pyson()
+ res['__class__'] = 'Or'
+ return res
+
+ @staticmethod
+ def eval(dct, context):
+ return bool(reduce(lambda x, y: x or y, dct['s']))
+
+
+class Equal(PYSON):
+
+ def __init__(self, statement1, statement2):
+ super(Equal, self).__init__()
+ if isinstance(statement1, PYSON):
+ types1 = statement1.types()
+ else:
+ types1 = set([type(statement1)])
+ if isinstance(statement2, PYSON):
+ types2 = statement2.types()
+ else:
+ types2 = set([type(statement2)])
+ assert types1 == types2, 'statements must have the same type'
+ self._statement1 = statement1
+ self._statement2 = statement2
+
+ def pyson(self):
+ return {
+ '__class__': 'Equal',
+ 's1': self._statement1,
+ 's2': self._statement2,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ return dct['s1'] == dct['s2']
+
+
+class Greater(PYSON):
+
+ def __init__(self, statement1, statement2, equal=False):
+ super(Greater, self).__init__()
+ for i in (statement1, statement2):
+ if isinstance(i, PYSON):
+ assert i.types().issubset(set([int, long, float])), \
+ 'statement must be an integer or a float'
+ else:
+ assert isinstance(i, (int, long, float)), \
+ 'statement must be an integer or a float'
+ if isinstance(equal, PYSON):
+ assert equal.types() == set([bool])
+ else:
+ assert isinstance(equal, bool)
+ self._statement1 = statement1
+ self._statement2 = statement2
+ self._equal = equal
+
+ def pyson(self):
+ return {
+ '__class__': 'Greater',
+ 's1': self._statement1,
+ 's2': self._statement2,
+ 'e': self._equal,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ if dct['e']:
+ return dct['s1'] >= dct['s2']
+ else:
+ return dct['s1'] > dct['s2']
+
+
+class Less(Greater):
+
+ def pyson(self):
+ res = super(Less, self).pyson()
+ res['__class__'] = 'Less'
+ return res
+
+ @staticmethod
+ def eval(dct, context):
+ if dct['e']:
+ return dct['s1'] <= dct['s2']
+ else:
+ return dct['s1'] < dct['s2']
+
+
+class If(PYSON):
+
+ def __init__(self, condition, then_statement, else_statement=None):
+ super(If, self).__init__()
+ if isinstance(condition, PYSON):
+ assert condition.types() == set([bool]), 'condition must be boolean'
+ else:
+ assert isinstance(condition, bool), 'condition must be boolean'
+ if isinstance(then_statement, PYSON):
+ then_types = then_statement.types()
+ else:
+ then_types = set([type(then_statement)])
+ if isinstance(else_statement, PYSON):
+ assert then_types == else_statement.types(), \
+ 'then and else statements must be the same type'
+ else:
+ assert then_types == set([type(else_statement)]), \
+ 'then and else statements must be the same type'
+ self._condition = condition
+ self._then_statement = then_statement
+ self._else_statement = else_statement
+
+ def pyson(self):
+ return {
+ '__class__': 'If',
+ 'c': self._condition,
+ 't': self._then_statement,
+ 'e': self._else_statement,
+ }
+
+ def types(self):
+ if isinstance(self._then_statement, PYSON):
+ return self._then_statement.types()
+ else:
+ return set([type(self._then_statement)])
+
+ @staticmethod
+ def eval(dct, context):
+ if dct['c']:
+ return dct['t']
+ else:
+ return dct['e']
+
+
+class Get(PYSON):
+
+ def __init__(self, obj, key, default=''):
+ super(Get, self).__init__()
+ if isinstance(obj, PYSON):
+ assert obj.types() == set([dict]), 'obj must be a dict'
+ else:
+ assert isinstance(obj, dict), 'obj must be a dict'
+ self._obj = obj
+ if isinstance(key, PYSON):
+ assert key.types() == set([str]), 'key must be a string'
+ else:
+ assert type(key) == str, 'key must be a string'
+ self._key = key
+ self._default = default
+
+ def pyson(self):
+ return {
+ '__class__': 'Get',
+ 'v': self._obj,
+ 'k': self._key,
+ 'd': self._default,
+ }
+
+ def types(self):
+ if isinstance(self._default, PYSON):
+ return self._default.types()
+ else:
+ return set([type(self._default)])
+
+ @staticmethod
+ def eval(dct, context):
+ return dct['v'].get(dct['k'], dct['d'])
+
+
+class In(PYSON):
+
+ def __init__(self, key, obj):
+ super(In, self).__init__()
+ if isinstance(key, PYSON):
+ assert key.types().issubset(set([str, int, long])), \
+ 'key must be a string or an integer or a long'
+ else:
+ assert type(key) in [str, int, long], \
+ 'key must be a string or an integer or a long'
+ if isinstance(obj, PYSON):
+ assert obj.types().issubset(set([dict, list])), \
+ 'obj must be a dict or a list'
+ if obj.types() == set([dict]):
+ assert type(key) == str, 'key must be a string'
+ else:
+ assert type(obj) in [dict, list]
+ if type(obj) == dict:
+ assert type(key) == str, 'key must be a string'
+ self._key = key
+ self._obj = obj
+
+ def pyson(self):
+ return {
+ '__class__': 'In',
+ 'k': self._key,
+ 'v': self._obj,
+ }
+
+ def types(self):
+ return set([bool])
+
+ @staticmethod
+ def eval(dct, context):
+ return dct['k'] in dct['v']
+
+
+class Date(PYSON):
+
+ def __init__(self, year=None, month=None, day=None,
+ delta_years=0, delta_months=0, delta_days=0):
+ super(Date, self).__init__()
+ for i in (year, month, day, delta_years, delta_months, delta_days):
+ if isinstance(i, PYSON):
+ assert i.types().issubset(set([int, long, type(None)])), \
+ '%s must be an integer or None' % (i,)
+ else:
+ assert isinstance(i, (int, long, type(None))), \
+ '%s must be an integer or None' % (i,)
+ self._year = year
+ self._month = month
+ self._day = day
+ self._delta_years = delta_years
+ self._delta_months = delta_months
+ self._delta_days = delta_days
+
+ def pyson(self):
+ return {
+ '__class__': 'Date',
+ 'y': self._year,
+ 'M': self._month,
+ 'd': self._day,
+ 'dy': self._delta_years,
+ 'dM': self._delta_months,
+ 'dd': self._delta_days,
+ }
+
+ def types(self):
+ return set([datetime.date])
+
+ @staticmethod
+ def eval(dct, context):
+ date = datetime.date.today()
+ replace = {}
+ for i, j in (('y', 'year'), ('M', 'month'), ('d', 'day')):
+ if dct[i] is not None:
+ replace[j] = dct[i]
+ date = date.replace(**replace)
+ if dct['dy']:
+ year = date.year + dct['dy']
+ date = date.replace(year=year)
+ if dct['dM']:
+ month = date.month + dct['dM']
+ year = date.year + month / 12
+ month = month % 12
+ date = date.replace(year=year, month=month)
+ if dct['dd']:
+ date += datetime.timedelta(days=dct['dd'])
+ return date
+
+
+class DateTime(Date):
+
+ def __init__(self, year=None, month=None, day=None,
+ hour=None, minute=None, second=None, microsecond=None,
+ delta_years=0, delta_months=0, delta_days=0,
+ delta_hours=0, delta_minutes=0, delta_seconds=0,
+ delta_microseconds=0):
+ super(DateTime, self).__init__(year=year, month=month, day=day,
+ delta_years=delta_years, delta_months=delta_months,
+ delta_days=delta_days)
+ for i in (hour, minute, second, microsecond,
+ delta_hours, delta_minutes, delta_seconds, delta_microseconds):
+ if isinstance(i, PYSON):
+ assert i.types() == set([int, long, type(None)]), \
+ '%s must be an integer or None' % (i,)
+ else:
+ assert isinstance(i, (int, long, type(None))), \
+ '%s must be an integer or None' % (i,)
+ self._hour = hour
+ self._minute = minute
+ self._second = second
+ self._microsecond = microsecond
+ self._delta_hours = delta_hours
+ self._delta_minutes = delta_minutes
+ self._delta_seconds = delta_seconds
+ self._delta_microseconds = delta_microseconds
+
+ def pyson(self):
+ res = super(DateTime, self).pyson()
+ res['__class__'] = 'DateTime'
+ res['h'] = self._hour
+ res['m'] = self._minute
+ res['s'] = self._second
+ res['ms'] = self._microsecond
+ res['dh'] = self._delta_hours
+ res['dm'] = self._delta_minutes
+ res['ds'] = self._delta_seconds
+ res['dms'] = self._delta_microseconds
+ return res
+
+ def types(self):
+ return set([datetime.datetime])
+
+ @staticmethod
+ def eval(dct, context):
+ date = Date.eval(dct, context)
+ datetime_ = datetime.datetime.combine(date,
+ datetime.datetime.now().time())
+ replace = {}
+ for i, j in (('h', 'hour'), ('m', 'minute'), ('s', 'second'),
+ ('ms', 'microsecond')):
+ if dct[i] is not None:
+ replace[j] = dct[i]
+ datetime_ = datetime_.replace(**replace)
+ delta = {}
+ for i, j in (('dh', 'hours'), ('dm', 'minutes'), ('ds', 'seconds'),
+ ('dms', 'microseconds')):
+ if dct[i]:
+ delta[j] = dct[i]
+ datetime_ += datetime.timedelta(**delta)
+ return datetime_
+
+CONTEXT = {
+ 'Eval': Eval,
+ 'Not': Not,
+ 'Bool': Bool,
+ 'And': And,
+ 'Or': Or,
+ 'Equal': Equal,
+ 'Greater': Greater,
+ 'Less': Less,
+ 'If': If,
+ 'Get': Get,
+ 'In': In,
+ 'Date': Date,
+ 'DateTime': DateTime,
+}
diff --git a/proteus/tests/__init__.py b/proteus/tests/__init__.py
new file mode 100644
index 0000000..fe882b9
--- /dev/null
+++ b/proteus/tests/__init__.py
@@ -0,0 +1,26 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+import os
+import sys
+import unittest
+
+def test_suite():
+ suite = unittest.TestSuite()
+ loader = unittest.TestLoader()
+ for filename in os.listdir(os.path.dirname(__file__)):
+ if filename.startswith("test") and filename.endswith(".py"):
+ modname = "proteus.tests." + filename[:-3]
+ __import__(modname)
+ module = sys.modules[modname]
+ suite.addTests(loader.loadTestsFromModule(module))
+ return suite
+
+def main():
+ suite = test_suite()
+ runner = unittest.TextTestRunner()
+ runner.run(suite)
+
+if __name__ == '__main__':
+ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+ os.path.abspath(__file__)))))
+ main()
diff --git a/proteus/tests/test_config.py b/proteus/tests/test_config.py
new file mode 100644
index 0000000..7190524
--- /dev/null
+++ b/proteus/tests/test_config.py
@@ -0,0 +1,29 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from unittest import TestCase
+import proteus.config
+
+
+class TestConfig(TestCase):
+
+ def setUp(self):
+ proteus.config.set_trytond(':memory:', database_type='sqlite')
+
+ def test_proxy(self):
+ config = proteus.config.get_config()
+ user_proxy = config.get_proxy('res.user')
+ user_id = user_proxy.search([('login', '=', 'admin')], 0, 1, None,
+ config.context)[0]
+ self.assert_(user_id == config.user)
+
+ def test_proxy_methods(self):
+ config = proteus.config.get_config()
+ self.assert_('search' in config.get_proxy_methods('res.user'))
+
+ def test_trytond_config_eq(self):
+ config1 = proteus.config.get_config()
+ proteus.config.set_trytond(':memory:', database_type='sqlite')
+ config2 = proteus.config.get_config()
+ self.assertEqual(config1, config2)
+
+ self.assertEqual(config1.__eq__(None), NotImplemented)
diff --git a/proteus/tests/test_model.py b/proteus/tests/test_model.py
new file mode 100644
index 0000000..8d1d760
--- /dev/null
+++ b/proteus/tests/test_model.py
@@ -0,0 +1,315 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from unittest import TestCase
+from proteus import config, Model
+
+
+class TestModel(TestCase):
+
+ def setUp(self):
+ config.set_trytond(':memory:', database_type='sqlite')
+
+ def test_class_cache(self):
+ User1 = Model.get('res.user')
+ User2 = Model.get('res.user')
+ self.assertEqual(id(User1), id(User2))
+
+ Model.reset()
+ User3 = Model.get('res.user')
+ self.assertNotEqual(id(User1), id(User3))
+
+ def test_class_method(self):
+ User = Model.get('res.user')
+ self.assert_(len(User.search([('login', '=', 'admin')], {})))
+
+ def test_find(self):
+ User = Model.get('res.user')
+ admin = User.find([('login', '=', 'admin')])[0]
+ self.assertEqual(admin.login, 'admin')
+
+ def test_many2one(self):
+ User = Model.get('res.user')
+ admin = User.find([('login', '=', 'admin')])[0]
+ self.assert_(isinstance(admin.create_uid, User))
+ try:
+ admin.create_uid = 'test'
+ self.fail()
+ except AssertionError:
+ pass
+ admin.create_uid = admin
+ admin.create_uid = None
+
+ def test_one2many(self):
+ Group = Model.get('res.group')
+ administration = Group.find([('name', '=', 'Administration')])[0]
+ self.assert_(isinstance(administration.model_access, list))
+ self.assert_(isinstance(administration.model_access[0],
+ Model.get('ir.model.access')))
+ try:
+ administration.model_access = []
+ self.fail()
+ except AttributeError:
+ pass
+
+ def test_many2many(self):
+ User = Model.get('res.user')
+ admin = User.find([('login', '=', 'admin')])[0]
+ self.assert_(isinstance(admin.groups, list))
+ self.assert_(isinstance(admin.groups[0],
+ Model.get('res.group')))
+ try:
+ admin.groups = []
+ self.fail()
+ except AttributeError:
+ pass
+
+ # TODO test date
+
+ def test_reference(self):
+ Attachment = Model.get('ir.attachment')
+ User = Model.get('res.user')
+ admin = User.find([('login', '=', 'admin')])[0]
+ attachment = Attachment()
+ attachment.name = 'Test'
+ attachment.resource = admin
+ attachment.save()
+ self.assertEqual(attachment.resource, admin)
+
+ def test_id_counter(self):
+ User = Model.get('res.user')
+ test1 = User()
+ self.assert_(test1.id < 0)
+ test2 = User()
+ self.assert_(test2.id < 0)
+ self.assertNotEqual(test1.id, test2.id)
+
+ def test_init(self):
+ User = Model.get('res.user')
+ self.assertEqual(User(1).id, 1)
+ self.assertEqual(User(name='Foo').name, 'Foo')
+
+ Lang = Model.get('ir.lang')
+ en_US = Lang.find([('code', '=', 'en_US')])[0]
+ self.assertEqual(User(language=en_US).language, en_US)
+ self.assertEqual(User(language=en_US.id).language, en_US)
+
+ Group = Model.get('res.group')
+ groups = Group.find()
+ self.assertEqual(len(User(groups=groups).groups), len(groups))
+ self.assertEqual(len(User(groups=[x.id for x in groups]).groups),
+ len(groups))
+
+ def test_save(self):
+ User = Model.get('res.user')
+ test = User()
+ test.name = 'Test'
+ test.login = 'test'
+ test.save()
+ self.assert_(test.id > 0)
+
+ test = User(test.id)
+ self.assertEqual(test.name, 'Test')
+ self.assertEqual(test.login, 'test')
+ self.assert_(test.active)
+
+ test.signature = 'Test signature'
+ self.assertEqual(test.signature, 'Test signature')
+ test.save()
+ self.assertEqual(test.signature, 'Test signature')
+ test = User(test.id)
+ self.assertEqual(test.signature, 'Test signature')
+
+ Group = Model.get('res.group')
+ test2 = User(name='Test 2', login='test2',
+ groups=[Group(name='Test 2')])
+ test2.save()
+ self.assert_(test2.id > 0)
+ self.assertEqual(test2.name, 'Test 2')
+ self.assertEqual(test2.login, 'test2')
+
+ def test_save_many2one(self):
+ User = Model.get('res.user')
+ test = User()
+ test.name = 'Test save many2one'
+ test.login = 'test_save_many2one'
+ test.save()
+
+ Lang = Model.get('ir.lang')
+ en_US = Lang.find([('code', '=', 'en_US')])[0]
+ test.language = en_US
+ test.save()
+ self.assertEqual(test.language, en_US)
+
+ test.language = None
+ test.save()
+ self.assertFalse(test.language)
+
+ def test_save_one2many(self):
+ Group = Model.get('res.group')
+ group = Group()
+ group.name = 'Test save one2many'
+ group.save()
+
+ ModelAccess = Model.get('ir.model.access')
+ Model_ = Model.get('ir.model')
+ model_access = ModelAccess()
+ model_access.model = Model_.find([('model', '=', 'res.group')])[0]
+ model_access.perm_read = True
+ model_access.perm_write = True
+ model_access.perm_create = True
+ model_access.perm_delete = True
+
+ group.model_access.append(model_access)
+ group.save()
+ self.assertEqual(len(group.model_access), 1)
+
+ model_access_id = group.model_access[0].id
+
+ group.name = 'Test save one2many bis'
+ group.model_access[0].description = 'Test save one2many'
+ group.save()
+ self.assertEqual(group.model_access[0].description,
+ 'Test save one2many')
+
+ group.model_access.pop()
+ group.save()
+ self.assertEqual(group.model_access, [])
+ self.assertEqual(len(ModelAccess.find([('id', '=', model_access_id)])),
+ 1)
+
+ group.model_access.append(ModelAccess(model_access_id))
+ group.save()
+ self.assertEqual(len(group.model_access), 1)
+
+ group.model_access.remove(group.model_access[0])
+ group.save()
+ self.assertEqual(group.model_access, [])
+ self.assertEqual(len(ModelAccess.find([('id', '=', model_access_id)])),
+ 0)
+
+ def test_save_many2many(self):
+ User = Model.get('res.user')
+ test = User()
+ test.name = 'Test save many2many'
+ test.login = 'test_save_many2many'
+ test.save()
+
+ Group = Model.get('res.group')
+ group = Group()
+ group.name = 'Test save many2many'
+ group.save()
+
+ test.groups.append(group)
+ test.save()
+ self.assertEqual(len(test.groups), 1)
+
+ group_id = test.groups[0].id
+
+ test.name = 'Test save many2many bis'
+ test.groups[0].name = 'Test save many2many bis'
+ test.save()
+ self.assertEqual(test.groups[0].name,
+ 'Test save many2many bis')
+
+ test.groups.pop()
+ test.save()
+ self.assertEqual(test.groups, [])
+ self.assertEqual(len(Group.find([('id', '=', group_id)])), 1)
+
+ test.groups.append(Group(group_id))
+ test.save()
+ self.assertEqual(len(test.groups), 1)
+
+ test.groups.remove(test.groups[0])
+ test.save()
+ self.assertEqual(test.groups, [])
+ self.assertEqual(len(Group.find([('id', '=', group_id)])), 0)
+
+ def test_cmp(self):
+ User = Model.get('res.user')
+ test = User()
+ test.name = 'Test cmp'
+ test.login = 'test_cmp'
+ test.save()
+ admin1 = User.find([('login', '=', 'admin')])[0]
+ admin2 = User.find([('login', '=', 'admin')])[0]
+
+ self.assertEqual(admin1, admin2)
+ self.assertNotEqual(admin1, test)
+ self.assertNotEqual(admin1, None)
+ self.assertNotEqual(admin1, False)
+
+ self.failUnlessRaises(NotImplementedError, lambda: admin1 == 1)
+
+ def test_default_set(self):
+ User = Model.get('res.user')
+ Group = Model.get('res.group')
+ group_ids = [x.id for x in Group.find()]
+ test = User()
+ test._default_set({
+ 'name': 'Test',
+ 'groups': group_ids,
+ })
+ self.assertEqual(test.name, 'Test')
+ self.assertEqual([x.id for x in test.groups], group_ids)
+
+ test = User()
+ test._default_set({
+ 'name': 'Test',
+ 'groups': [
+ {
+ 'name': 'Group 1',
+ },
+ {
+ 'name': 'Group 2',
+ },
+ ],
+ })
+ self.assertEqual(test.name, 'Test')
+ self.assertEqual([x.name for x in test.groups], ['Group 1', 'Group 2'])
+
+ def test_delete(self):
+ User = Model.get('res.user')
+ test = User()
+ test.name = 'Test delete'
+ test.login = 'test delete'
+ test.save()
+ self.assert_(test.delete())
+
+ def test_on_change(self):
+ Trigger = Model.get('ir.trigger')
+
+ trigger = Trigger()
+
+ trigger.on_time = True
+ self.assertEqual(trigger.on_create, False)
+
+ trigger.on_create = True
+ self.assertEqual(trigger.on_time, False)
+
+ def test_on_change_set(self):
+ User = Model.get('res.user')
+ Group = Model.get('res.group')
+
+ test = User()
+ test._on_change_set('name', 'Test')
+ self.assertEqual(test.name, 'Test')
+ group_ids = [x.id for x in Group.find()]
+ test._on_change_set('groups', group_ids)
+ self.assertEqual([x.id for x in test.groups], group_ids)
+
+ test._on_change_set('groups', {'remove': [group_ids[0]]})
+ self.assertEqual([x.id for x in test.groups], group_ids[1:])
+
+ test._on_change_set('groups', {'add': [{
+ 'name': 'Bar',
+ }]})
+ self.assert_([x for x in test.groups if x.name == 'Bar'])
+
+ test.groups.extend(Group.find())
+ group = test.groups[0]
+ test._on_change_set('groups', {'update': [{
+ 'id': group.id,
+ 'name': 'Foo',
+ }]})
+ self.assert_([x for x in test.groups if x.name == 'Foo'])
diff --git a/proteus/tests/test_wizard.py b/proteus/tests/test_wizard.py
new file mode 100644
index 0000000..4541b8a
--- /dev/null
+++ b/proteus/tests/test_wizard.py
@@ -0,0 +1,41 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from unittest import TestCase
+from proteus import config, Wizard, Model
+
+
+class TestWizard(TestCase):
+
+ def setUp(self):
+ config.set_trytond(':memory:', database_type='sqlite')
+
+ def test_translation_clean(self):
+ translation_clean = Wizard('ir.translation.clean')
+ self.assertEqual(translation_clean.form.__class__.__name__,
+ 'ir.translation.clean.init')
+ translation_clean.execute('start')
+
+ def test_translation_export(self):
+ translation_export = Wizard('ir.translation.export')
+ translation_export.form.lang = 'en_US'
+ translation_export.form.module = 'ir'
+ translation_export.execute('start')
+ self.assert_(translation_export.form.file)
+ translation_export.execute('end')
+
+ def test_user_config(self):
+ User = Model.get('res.user')
+
+ user_config = Wizard('res.user.config')
+ user_config.execute('user')
+ user_config.form.name = 'Foo'
+ user_config.form.login = 'foo'
+ user_config.execute('add')
+ self.assertEqual(user_config.form.name, None)
+ self.assertEqual(user_config.form.login, None)
+ user_config.form.name = 'Bar'
+ user_config.form.login = 'bar'
+ user_config.execute('end')
+
+ self.assert_(User.find([('name', '=', 'Foo')]))
+ self.assertFalse(User.find([('name', '=', 'Bar')]))
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..6ed5377
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from setuptools import setup, find_packages
+import sys
+import os
+import proteus
+
+major_version, minor_version, _ = proteus.__version__.split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
+
+SIMPLEJSON = []
+if sys.version_info < (2, 6):
+ SIMPLEJSON = ['simplejson']
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+setup(name='proteus',
+ version=proteus.__version__,
+ description='Library to access Tryton server as a client',
+ long_description=read('README'),
+ author='B2CK',
+ author_email='info at b2ck.com',
+ url='http://www.tryton.org/',
+ download_url="http://downloads.tryton.org/" + \
+ proteus.__version__.rsplit('.', 1)[0] + '/',
+ packages=find_packages(),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=SIMPLEJSON,
+ extras_require={
+ 'trytond': ['trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1)],
+ },
+ test_suite='proteus.tests',
+ tests_require=('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
+)
--
tryton-proteus
More information about the tryton-debian-vcs
mailing list