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

issue7497
review53261002
---
 .drone.yml                               |  6 ------
 CHANGELOG                                |  4 +++-
 INSTALL                                  |  2 +-
 account.py                               |  9 +++------
 setup.py                                 | 20 +++++++-------------
 tests/scenario_account_dunning_email.rst |  2 +-
 tox.ini                                  |  6 +++---
 7 files changed, 18 insertions(+), 31 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 94d01a64ec..585fc68878 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
+* Remove support for Python 2.7
+
 Version 4.8.0 - 2018-04-23
 * Bug fixes (see mercurial logs for details)
 
 Version 4.6.0 - 2017-10-30
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/INSTALL b/INSTALL
index 7cfb6fdb50..4024cebec6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_dunning_email
 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 (http://www.tryton.org/)
  * trytond_party (http://www.tryton.org/)
diff --git a/account.py b/account.py
index 07ba1c260f..0194d0c7e2 100644
--- a/account.py
+++ b/account.py
@@ -15,8 +15,7 @@ from trytond.wizard import StateTransition
 __all__ = ['DunningLevel', 'ProcessDunning', 'Dunning', 'DunningEmailLog']
 
 
-class DunningLevel:
-    __metaclass__ = PoolMeta
+class DunningLevel(metaclass=PoolMeta):
     __name__ = 'account.dunning.level'
     send_email = fields.Boolean("Send Email")
     email_template = fields.Many2One(
@@ -48,8 +47,7 @@ class DunningLevel:
             return
 
 
-class ProcessDunning:
-    __metaclass__ = PoolMeta
+class ProcessDunning(metaclass=PoolMeta):
     __name__ = 'account.dunning.process'
     send_email = StateTransition()
 
@@ -77,8 +75,7 @@ class ProcessDunning:
         return self.next_state('send_email')
 
 
-class Dunning:
-    __metaclass__ = PoolMeta
+class Dunning(metaclass=PoolMeta):
     __name__ = 'account.dunning'
 
     def send_email(self, datamanager=None):
diff --git a/setup.py b/setup.py
index 38a983458e..9addf94057 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'))
@@ -100,7 +98,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',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -119,8 +117,4 @@ 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_dunning_email.rst',
-        ],
     )
diff --git a/tests/scenario_account_dunning_email.rst b/tests/scenario_account_dunning_email.rst
index e3bab744ec..f77ae404b0 100644
--- a/tests/scenario_account_dunning_email.rst
+++ b/tests/scenario_account_dunning_email.rst
@@ -115,4 +115,4 @@ Process dunning::
     >>> process_dunning.execute('process')
     >>> dunning.reload()
     >>> dunning.state
-    u'done'
+    'done'
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://}