From a936a2ddf4be1f3f410065e7f31ab9762a429b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 27 Feb 2016 23:53:38 +0100
Subject: [PATCH] Add Python3 support

issue3211
review19961002
---
 .drone.yml               |  4 ++--
 CHANGELOG                |  2 ++
 product.py               |  2 +-
 setup.py                 | 19 ++++++++++++++++---
 stock.py                 |  3 ++-
 tests/__init__.py        |  2 +-
 tests/test_production.py |  2 ++
 tox.ini                  |  4 ++--
 8 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9d7c769d8c..c4fd423e94 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,9 @@
-image: python2.7
+image: python:all
 env:
   - POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/
   - MYSQL_URI=mysql://root@127.0.0.1:3306/
 script:
   - pip install tox
-  - tox -e "py27-{sqlite,postgresql}"
+  - tox -e "{py27,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters
 services:
   - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 8230fda927..8bf5e6018d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Add Python3 support
+
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/product.py b/product.py
index b55416bd85..a2a3f3a1b8 100644
--- a/product.py
+++ b/product.py
@@ -8,10 +8,10 @@ from trytond.pyson import Eval, Get, If, Bool
 from trytond.pool import PoolMeta
 
 __all__ = ['Product', 'ProductBom']
-__metaclass__ = PoolMeta
 
 
 class Product:
+    __metaclass__ = PoolMeta
     __name__ = 'product.product'
 
     boms = fields.One2Many('product.product-production.bom', 'product',
diff --git a/setup.py b/setup.py
index cb62fe63e2..280fdf8c71 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -95,6 +101,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -110,4 +119,8 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
+    convert_2to3_doctests=[
+        'tests/scenario_production.rst',
+        ],
     )
diff --git a/stock.py b/stock.py
index 71e3780c88..724e0132b1 100644
--- a/stock.py
+++ b/stock.py
@@ -6,10 +6,10 @@ from trytond.pool import PoolMeta
 
 
 __all__ = ['Location', 'Move']
-__metaclass__ = PoolMeta
 
 
 class Location:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.location'
     production_location = fields.Many2One('stock.location', 'Production',
         states={
@@ -24,6 +24,7 @@ class Location:
 
 
 class Move:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.move'
     production_input = fields.Many2One('production', 'Production Input',
         readonly=True, select=True, ondelete='CASCADE',
diff --git a/tests/__init__.py b/tests/__init__.py
index b968fe3e43..72dc29eb83 100644
--- a/tests/__init__.py
+++ b/tests/__init__.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.
 
-from test_production import suite
+from .test_production import suite
 
 __all__ = ['suite']
diff --git a/tests/test_production.py b/tests/test_production.py
index 6f8bc89a5f..790cf7a3af 100644
--- a/tests/test_production.py
+++ b/tests/test_production.py
@@ -5,6 +5,7 @@ import doctest
 import trytond.tests.test_tryton
 from trytond.tests.test_tryton import ModuleTestCase
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
 
 
 class ProductionTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
             ProductionTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_production.rst',
         setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tox.ini b/tox.ini
index e9d2876444..e2a064851d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = py27-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    py27-postgresql: psycopg2 >= 2.0
+    {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.0
     pypy-postgresql: psycopg2cffi >= 2.5
     mysql: MySQL-python
 setenv =