From 44558bcb5c2e70084fe0f7915336d7ad083ecb38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 21 Feb 2016 21:00:31 +0100
Subject: [PATCH] Add Python3 support

issue3211
---
 .drone.yml |  4 ++--
 CHANGELOG  |  2 ++
 company.py |  2 +-
 res.py     |  2 +-
 setup.py   | 16 +++++++++++++---
 tox.ini    |  4 ++--
 6 files changed, 21 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 501f571caf..4291d4145c 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/company.py b/company.py
index 851f6c42f3..aa302ed08a 100644
--- a/company.py
+++ b/company.py
@@ -5,10 +5,10 @@ from trytond.pool import PoolMeta
 
 
 __all__ = ['Company']
-__metaclass__ = PoolMeta
 
 
 class Company:
+    __metaclass__ = PoolMeta
     __name__ = 'company.company'
 
     hours_per_work_day = fields.Float("Hours per Work Day", required=True)
diff --git a/res.py b/res.py
index 3c12920aea..f8972faf21 100644
--- a/res.py
+++ b/res.py
@@ -4,10 +4,10 @@ from trytond.pool import PoolMeta
 
 
 __all__ = ['User']
-__metaclass__ = PoolMeta
 
 
 class User:
+    __metaclass__ = PoolMeta
     __name__ = 'res.user'
 
     @classmethod
diff --git a/setup.py b/setup.py
index aa2c9065b1..0b98664e11 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'):
@@ -88,6 +94,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',
@@ -101,4 +110,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    use_2to3=True,
     )
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 =