[tryton-debian-vcs] tryton-server branch upstream-2.8 updated. upstream/2.8.8-1-g682435c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jul 3 16:04:03 UTC 2014
The following commit has been merged in the upstream-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/2.8.8-1-g682435c
commit 682435c72e2c528a62c0adee919fdbed1f0d42cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 2 14:12:44 2014 +0200
Adding upstream version 2.8.9.
diff --git a/CHANGELOG b/CHANGELOG
index 3d9d440..71c19b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.9 - 2014-07-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.8 - 2014-04-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index ac43a49..d2c8a9a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 2.8.8
+Version: 2.8.9
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index ac43a49..d2c8a9a 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 2.8.8
+Version: 2.8.9
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/model/model.py b/trytond/model/model.py
index 27d0135..81588f2 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -497,7 +497,7 @@ class Model(WarningErrorMixin, URLMixin):
res[field]['delete'] = accesses.get(field, {}).get('delete',
True)
if res[field]['type'] == 'one2many' \
- and hasattr(cls._fields[field], 'field'):
+ and getattr(cls._fields[field], 'field', None):
res[field]['relation_field'] = copy.copy(
cls._fields[field].field)
if res[field]['type'] in ('datetime', 'time'):
diff --git a/trytond/protocols/jsonrpc.py b/trytond/protocols/jsonrpc.py
index 5123615..7f45593 100644
--- a/trytond/protocols/jsonrpc.py
+++ b/trytond/protocols/jsonrpc.py
@@ -301,7 +301,7 @@ class SimpleJSONRPCServer(SocketServer.TCPServer,
def server_close(self):
SocketServer.TCPServer.server_close(self)
- for handler in self.handlers:
+ for handler in self.handlers.copy():
self.shutdown_request(handler.request)
if sys.version_info[:2] <= (2, 6):
diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index 5e13d7d..fd283ac 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -202,7 +202,7 @@ class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn,
def server_close(self):
SimpleXMLRPCServer.SimpleXMLRPCServer.server_close(self)
- for handler in self.handlers:
+ for handler in self.handlers.copy():
self.shutdown_request(handler.request)
if sys.version_info[:2] <= (2, 6):
diff --git a/trytond/version.py b/trytond/version.py
index e46c4c9..e9ab779 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "trytond"
-VERSION = "2.8.8"
+VERSION = "2.8.9"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list