From 55bcfd4bd632346ea6262c7ac445433127dd8042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 26 Jun 2018 19:11:42 +0200
Subject: [PATCH] Remove support for Python 2.7

issue7497
review53261002
---
 .drone.yml      |  6 ------
 CHANGELOG       |  2 ++
 INSTALL         |  2 +-
 invoice.py      |  3 +--
 party.py        |  6 ++----
 payment_term.py |  6 ++----
 setup.py        | 17 +++++++----------
 tox.ini         |  6 +++---
 8 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e0bc2f7026..5da6083eb7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,12 +25,6 @@ services:
 
 matrix:
     include:
-        - IMAGE: python:2.7
-          TOXENV: py27
-          DATABASE: sqlite
-        - IMAGE: python:2.7
-          TOXENV: py27
-          DATABASE: postgresql
         - IMAGE: python:3.4
           TOXENV: py34
           DATABASE: sqlite
diff --git a/CHANGELOG b/CHANGELOG
index 5b80ab9e53..3e9a088cad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Remove support for Python 2.7
+
 Version 4.8.0 - 2018-04-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/INSTALL b/INSTALL
index 4718db8a79..a5ff0dc63f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_invoice_history
 Prerequisites
 -------------
 
- * Python 2.7 or later (http://www.python.org/)
+ * Python 3.4 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_account_invoice (http://www.tryton.org/)
  * trytond_party (http://www.tryton.org/)
diff --git a/invoice.py b/invoice.py
index 3e8a7cf5ec..6d4fec96d2 100644
--- a/invoice.py
+++ b/invoice.py
@@ -8,8 +8,7 @@ from trytond.pool import PoolMeta
 __all__ = ['Invoice']
 
 
-class Invoice:
-    __metaclass__ = PoolMeta
+class Invoice(metaclass=PoolMeta):
     __name__ = 'account.invoice'
     open_date = fields.DateTime('Open Date')
 
diff --git a/party.py b/party.py
index b65e408751..24aa33f095 100644
--- a/party.py
+++ b/party.py
@@ -5,13 +5,11 @@ from trytond.pool import PoolMeta
 __all__ = ['Party', 'Address']
 
 
-class Party:
-    __metaclass__ = PoolMeta
+class Party(metaclass=PoolMeta):
     __name__ = 'party.party'
     _history = True
 
 
-class Address:
-    __metaclass__ = PoolMeta
+class Address(metaclass=PoolMeta):
     __name__ = 'party.address'
     _history = True
diff --git a/payment_term.py b/payment_term.py
index 6873adb873..b2d3200be2 100644
--- a/payment_term.py
+++ b/payment_term.py
@@ -5,13 +5,11 @@ from trytond.pool import PoolMeta
 __all__ = ['PaymentTerm', 'PaymentTermLine']
 
 
-class PaymentTerm:
-    __metaclass__ = PoolMeta
+class PaymentTerm(metaclass=PoolMeta):
     __name__ = 'account.invoice.payment_term'
     _history = True
 
 
-class PaymentTermLine:
-    __metaclass__ = PoolMeta
+class PaymentTermLine(metaclass=PoolMeta):
     __name__ = 'account.invoice.payment_term.line'
     _history = True
diff --git a/setup.py b/setup.py
index cb3a9e97fd..a1aa3cbc45 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # 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 setuptools import setup
-import re
-import os
 import io
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+import os
+import re
+from configparser import ConfigParser
+from setuptools import setup
 
 
 def read(fname):
@@ -27,6 +24,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
+
 config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -99,7 +97,6 @@ setup(name=name,
         'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
@@ -109,6 +106,7 @@ setup(name=name,
         'Topic :: Office/Business :: Financial :: Accounting',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -118,5 +116,4 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-    use_2to3=True,
     )
diff --git a/tox.ini b/tox.ini
index 2082ab4f4d..adbcbf8431 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = {py27,py34,py35,py36}-{sqlite,postgresql},pypy-{sqlite,postgresql}
+envlist = {py34,py35,py36}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
-    pypy-postgresql: psycopg2cffi >= 2.5
+    {py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    pypy3-postgresql: psycopg2cffi >= 2.5
     sqlite: sqlitebck
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}