From 7fd3bf4cd53c24328d0fdc05249842e69ce1008c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 3 Mar 2016 19:52:56 +0100
Subject: [PATCH] Add Python3 support

issue3211
---
 .drone.yml |  4 ++--
 CHANGELOG  |  2 ++
 product.py |  3 ++-
 setup.py   | 16 +++++++++++++---
 stock.py   |  5 ++++-
 tox.ini    |  4 ++--
 6 files changed, 25 insertions(+), 9 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 60b12f2080..47b7a9b01f 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)
 * Add Shelf Life Delay
diff --git a/product.py b/product.py
index 189d6f6fef..5f306e48f8 100644
--- a/product.py
+++ b/product.py
@@ -7,10 +7,10 @@ from trytond.pyson import Eval
 from .stock import DATE_STATE
 
 __all__ = ['Template', 'Product']
-__metaclass__ = PoolMeta
 
 
 class Template:
+    __metaclass__ = PoolMeta
     __name__ = 'product.template'
 
     shelf_life_state = fields.Selection(
@@ -40,4 +40,5 @@ class Template:
 
 
 class Product:
+    __metaclass__ = PoolMeta
     __name__ = 'product.product'
diff --git a/setup.py b/setup.py
index c00f0a156b..c9b49c56c4 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'):
@@ -90,6 +96,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',
@@ -104,4 +113,5 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
     )
diff --git a/stock.py b/stock.py
index e15ed3a27b..4cedadf8f9 100644
--- a/stock.py
+++ b/stock.py
@@ -12,7 +12,6 @@ from trytond.transaction import Transaction
 from trytond.tools import grouped_slice
 
 __all__ = ['Configuration', 'Lot', 'Move', 'Period']
-__metaclass__ = PoolMeta
 
 DATE_STATE = [
     ('none', 'None'),
@@ -22,6 +21,7 @@ DATE_STATE = [
 
 
 class Configuration:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.configuration'
 
     shelf_life_delay = fields.Property(fields.Integer('Shelf Life Delay',
@@ -30,6 +30,7 @@ class Configuration:
 
 
 class Lot:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.lot'
 
     shelf_life_expiration_date = fields.Date('Shelf Life Expiration Date',
@@ -131,6 +132,7 @@ class Lot:
 
 
 class Move:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.move'
 
     @classmethod
@@ -281,6 +283,7 @@ class Move:
 
 
 class Period:
+    __metaclass__ = PoolMeta
     __name__ = 'stock.period'
 
     @classmethod
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 =