From 52afa0d39d22d186edbc4fec4e03ed46b38036f4 Mon Sep 17 00:00:00 2001
From: Jonathan Levy <jonl@advocatetax.com>
Date: Thu, 10 Mar 2016 22:24:04 +0100
Subject: [PATCH] Add Python3 support

issue3211
review16061002
---
 .drone.yml        |  4 ++--
 CHANGELOG         |  2 ++
 party.py          |  2 +-
 sale.py           |  2 +-
 setup.py          | 16 +++++++++++++---
 tests/__init__.py |  2 +-
 tox.ini           |  4 ++--
 7 files changed, 22 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 8d80dcb621..66333ba609 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/party.py b/party.py
index c80ed9a2ff..0e1b8b8d22 100644
--- a/party.py
+++ b/party.py
@@ -4,10 +4,10 @@ from trytond.pool import Pool, PoolMeta
 from trytond.transaction import Transaction
 
 __all__ = ['Party']
-__metaclass__ = PoolMeta
 
 
 class Party:
+    __metaclass__ = PoolMeta
     __name__ = 'party.party'
 
     @classmethod
diff --git a/sale.py b/sale.py
index 2cdee8229b..ca9bd9db06 100644
--- a/sale.py
+++ b/sale.py
@@ -3,10 +3,10 @@
 from trytond.pool import PoolMeta
 
 __all__ = ['Sale']
-__metaclass__ = PoolMeta
 
 
 class Sale:
+    __metaclass__ = PoolMeta
     __name__ = 'sale.sale'
 
     @classmethod
diff --git a/setup.py b/setup.py
index f57a10c759..8b25c45cb6 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',
@@ -102,4 +111,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    use_2to3=True,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 8358e366d8..39a649ef20 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_sale_credit_limit import suite
+from .test_sale_credit_limit import suite
 
 __all__ = ['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 =