From a3c1b4976c74e8039baafbb0a6484df27a9654c2 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:40 +0200
Subject: [PATCH] Remove support for Python 2.7

issue7497
review53261002
---
 .drone.yml |  6 ------
 CHANGELOG  |  2 ++
 INSTALL    |  2 +-
 account.py |  6 ++----
 invoice.py |  6 ++----
 party.py   |  6 ++----
 setup.py   | 18 +++++++-----------
 tox.ini    |  6 +++---
 8 files changed, 19 insertions(+), 33 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 6072b3e29a..e1829aab54 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)
 * Check pending deposit to erase party
diff --git a/INSTALL b/INSTALL
index 46173a840a..f8a39d5b24 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_deposit
 Prerequisites
 -------------
 
- * Python 2.7 or later (http://www.python.org/)
+ * Python 3.4 or later (http://www.python.org/)
  * python-dateutil (http://labix.org/python-dateutil)
  * python-sql (http://code.google.com/p/python-sql/)
  * trytond (http://www.tryton.org/)
diff --git a/account.py b/account.py
index 9cf53277d6..a57e1ca007 100644
--- a/account.py
+++ b/account.py
@@ -5,8 +5,7 @@ from trytond.pool import PoolMeta
 __all__ = ['AccountTemplate', 'Account']
 
 
-class AccountTemplate:
-    __metaclass__ = PoolMeta
+class AccountTemplate(metaclass=PoolMeta):
     __name__ = 'account.account.template'
 
     @classmethod
@@ -15,8 +14,7 @@ class AccountTemplate:
         cls.kind.selection.append(('deposit', 'Deposit'))
 
 
-class Account:
-    __metaclass__ = PoolMeta
+class Account(metaclass=PoolMeta):
     __name__ = 'account.account'
 
     @classmethod
diff --git a/invoice.py b/invoice.py
index 0c83437f2e..d8d764192d 100644
--- a/invoice.py
+++ b/invoice.py
@@ -10,8 +10,7 @@ __all__ = ['Invoice', 'InvoiceLine',
     'DepositRecall', 'DepositRecallStart']
 
 
-class Invoice:
-    __metaclass__ = PoolMeta
+class Invoice(metaclass=PoolMeta):
     __name__ = 'account.invoice'
 
     @classmethod
@@ -109,8 +108,7 @@ class Invoice:
                         })
 
 
-class InvoiceLine:
-    __metaclass__ = PoolMeta
+class InvoiceLine(metaclass=PoolMeta):
     __name__ = 'account.invoice.line'
 
     @classmethod
diff --git a/party.py b/party.py
index cc7e2c18a7..9ed6301cb7 100644
--- a/party.py
+++ b/party.py
@@ -16,8 +16,7 @@ from trytond.tools import grouped_slice, reduce_ids
 __all__ = ['Party', 'PartyErase']
 
 
-class Party:
-    __metaclass__ = PoolMeta
+class Party(metaclass=PoolMeta):
     __name__ = 'party.party'
 
     deposit = fields.Function(fields.Numeric('Deposit',
@@ -134,8 +133,7 @@ class Party:
         return not amount or ((amount < 0) == (sign < 0))
 
 
-class PartyErase:
-    __metaclass__ = PoolMeta
+class PartyErase(metaclass=PoolMeta):
     __name__ = 'party.erase'
 
     @classmethod
diff --git a/setup.py b/setup.py
index 1a91b2ec23..799bf794f4 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'))
@@ -102,7 +100,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',
@@ -112,6 +109,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,
@@ -122,6 +120,4 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
-    use_2to3=True,
-    convert_2to_2_doctests=['tests/scenario_deposit.rst'],
     )
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://}