From cb05e77e62f4a74b0e2cbe7160cd4f35d2d20622 Mon Sep 17 00:00:00 2001 From: Jonathan Levy Date: Tue, 8 Mar 2016 12:19:16 +0100 Subject: [PATCH] Add Python3 support issue3211 review19051002 --- .drone.yml | 4 ++-- CHANGELOG | 2 ++ account.py | 2 +- payment.py | 3 ++- setup.py | 20 ++++++++++++++++--- statement.py | 3 ++- ...ario_account_negative_payment_clearing.rst | 2 +- tests/scenario_account_payment_clearing.rst | 2 +- tests/test_account_payment_clearing.py | 3 +++ tox.ini | 4 ++-- 10 files changed, 33 insertions(+), 12 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 dcad8e5d91..952437fc81 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/account.py b/account.py index 76721de561..4f8a9dc07b 100644 --- a/account.py +++ b/account.py @@ -4,10 +4,10 @@ from trytond.pool import PoolMeta __all__ = ['Move'] -__metaclass__ = PoolMeta class Move: + __metaclass__ = PoolMeta __name__ = 'account.move' @classmethod diff --git a/payment.py b/payment.py index 70ce6c04b5..48474c88db 100644 --- a/payment.py +++ b/payment.py @@ -7,10 +7,10 @@ from trytond.model import ModelView, Workflow, fields from trytond.pyson import Eval, Bool __all__ = ['Journal', 'Payment'] -__metaclass__ = PoolMeta class Journal: + __metaclass__ = PoolMeta __name__ = 'account.payment.journal' clearing_account = fields.Many2One('account.account', 'Clearing Account', domain=[('party_required', '=', False)], @@ -26,6 +26,7 @@ class Journal: class Payment: + __metaclass__ = PoolMeta __name__ = 'account.payment' clearing_move = fields.Many2One('account.move', 'Clearing Move', readonly=True) diff --git a/setup.py b/setup.py index c6021c6217..09be788e28 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'): @@ -96,6 +102,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', @@ -112,4 +121,9 @@ setup(name=name, test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, + use_2to3=True, + convert_2to3_doctests=[ + 'tests/scenario_account_negative_payment_clearing.rst', + 'tests/scenario_account_payment_clearing.rst', + ], ) diff --git a/statement.py b/statement.py index 00c35121a8..a82e7942cb 100644 --- a/statement.py +++ b/statement.py @@ -6,10 +6,10 @@ from trytond.pyson import Eval, If, Bool from trytond.transaction import Transaction __all__ = ['Statement', 'StatementLine'] -__metaclass__ = PoolMeta class Statement: + __metaclass__ = PoolMeta __name__ = 'account.statement' @classmethod @@ -40,6 +40,7 @@ class Statement: class StatementLine: + __metaclass__ = PoolMeta __name__ = 'account.statement.line' payment = fields.Many2One('account.payment', 'Payment', domain=[ diff --git a/tests/scenario_account_negative_payment_clearing.rst b/tests/scenario_account_negative_payment_clearing.rst index 26bee3ad92..8cd90887a0 100644 --- a/tests/scenario_account_negative_payment_clearing.rst +++ b/tests/scenario_account_negative_payment_clearing.rst @@ -11,7 +11,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 >>> today = datetime.date.today() diff --git a/tests/scenario_account_payment_clearing.rst b/tests/scenario_account_payment_clearing.rst index c45e6055b5..9262d3fa34 100644 --- a/tests/scenario_account_payment_clearing.rst +++ b/tests/scenario_account_payment_clearing.rst @@ -11,7 +11,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 >>> today = datetime.date.today() diff --git a/tests/test_account_payment_clearing.py b/tests/test_account_payment_clearing.py index 4c8c092978..fcbb467cca 100644 --- a/tests/test_account_payment_clearing.py +++ b/tests/test_account_payment_clearing.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 AccountPaymentTestCase(ModuleTestCase): @@ -19,9 +20,11 @@ def suite(): suite.addTests(doctest.DocFileSuite( 'scenario_account_payment_clearing.rst', setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) suite.addTests(doctest.DocFileSuite( 'scenario_account_negative_payment_clearing.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 =