[tryton-debian-vcs] tryton-server branch debian-wheezy-2.6 updated. debian/2.6.11-1-2-g1f7d0b8

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/2.6.11-1-2-g1f7d0b8

commit 1f7d0b822b992957711d118f8fdb2de1b6090e2d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:09:44 2014 +0200

    Releasing debian version 2.6.12-1.

diff --git a/debian/changelog b/debian/changelog
index 961b205..bf5c0bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (2.6.12-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.12.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 02 Jul 2014 14:09:44 +0200
+
 tryton-server (2.6.11-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.11.
commit 66de6c8c3037f1f58d5ab204989f5ca3ab089f7d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:09:42 2014 +0200

    Merging upstream version 2.6.12.

diff --git a/CHANGELOG b/CHANGELOG
index 54694c9..e543ab0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.12 - 2014-07-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.11 - 2014-04-07
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index b347cae..e3a0357 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.11
+Version: 2.6.12
 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 b347cae..e3a0357 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.6.11
+Version: 2.6.12
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/model.py b/trytond/model/model.py
index 2859604..df5c4f8 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -557,7 +557,7 @@ class Model(WarningErrorMixin, URLMixin):
                 res[field]['create'] = fcreate_accesses.get(field, True)
                 res[field]['delete'] = fdelete_accesses.get(field, 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 ca2bff4..880e18f 100644
--- a/trytond/protocols/jsonrpc.py
+++ b/trytond/protocols/jsonrpc.py
@@ -303,7 +303,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 c6d26da..9fe79c3 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -203,7 +203,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 3feb23c..5781d75 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.6.11"
+VERSION = "2.6.12"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server