From fe736356f932f0198591e09a16e0bfcce28e5773 Mon Sep 17 00:00:00 2001
From: Jonathan Levy <jonl@advocatetax.com>
Date: Wed, 9 Mar 2016 22:03:02 +0100
Subject: [PATCH] Add Python3 support

issue3211
review17911003
---
 .drone.yml                               |  4 ++--
 CHANGELOG                                |  2 ++
 party.py                                 |  2 +-
 sale.py                                  |  2 +-
 setup.py                                 | 19 ++++++++++++++++---
 tests/scenario_sale_invoice_grouping.rst |  2 +-
 tests/test_sale_invoice_grouping.py      |  2 ++
 tox.ini                                  |  4 ++--
 8 files changed, 27 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 1f11dda33b..f4d693dd96 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 5eeb8eb317..864fd30991 100644
--- a/party.py
+++ b/party.py
@@ -4,11 +4,11 @@
 from trytond.model import fields
 from trytond.pool import PoolMeta
 
-__metaclass__ = PoolMeta
 __all__ = ['Party']
 
 
 class Party:
+    __metaclass__ = PoolMeta
     __name__ = 'party.party'
 
     sale_invoice_grouping_method = fields.Property(fields.Selection([
diff --git a/sale.py b/sale.py
index c1a11faa6a..09ab1ab255 100644
--- a/sale.py
+++ b/sale.py
@@ -3,11 +3,11 @@
 
 from trytond.pool import Pool, PoolMeta
 
-__metaclass__ = PoolMeta
 __all__ = ['Sale']
 
 
 class Sale:
+    __metaclass__ = PoolMeta
     __name__ = 'sale.sale'
 
     @property
diff --git a/setup.py b/setup.py
index 8735dc0278..a7606b1f34 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'):
@@ -93,6 +99,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',
@@ -109,4 +118,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_sale_invoice_grouping.rst',
+        ],
     )
diff --git a/tests/scenario_sale_invoice_grouping.rst b/tests/scenario_sale_invoice_grouping.rst
index 3e19653ce3..74bb78b632 100644
--- a/tests/scenario_sale_invoice_grouping.rst
+++ b/tests/scenario_sale_invoice_grouping.rst
@@ -13,7 +13,7 @@ Imports::
     ...     get_company
     >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
     ...     create_chart, get_accounts
-    >>> from.trytond.modules.account_invoice.tests.tools import \
+    >>> from trytond.modules.account_invoice.tests.tools import \
     ...     set_fiscalyear_invoice_sequences, create_payment_term
     >>> today = datetime.date.today()
 
diff --git a/tests/test_sale_invoice_grouping.py b/tests/test_sale_invoice_grouping.py
index 7452b1dc45..97a15514e3 100644
--- a/tests/test_sale_invoice_grouping.py
+++ b/tests/test_sale_invoice_grouping.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 SaleInvoiceGroupingTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
             SaleInvoiceGroupingTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_sale_invoice_grouping.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 =