Remove support for Python 2.7

issue7497
review53261002

.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

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)
 
@@ -27,4 +29,4 @@ Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 
 Version 3.0.0 - 2013-10-21
-* Initial release
+* Initial release

INSTALL

@@ -4,7 +4,7 @@ Installing trytond_account_dunning_letter
 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/)

dunning.py

@@ -15,14 +15,12 @@ from trytond.tools import grouped_slice
 __all__ = ['Level', 'ProcessDunning', 'Letter']
 
 
-class Level:
-    __metaclass__ = PoolMeta
+class Level(metaclass=PoolMeta):
     __name__ = 'account.dunning.level'
     print_on_letter = fields.Boolean('Print on Letter')
 
 
-class ProcessDunning:
-    __metaclass__ = PoolMeta
+class ProcessDunning(metaclass=PoolMeta):
     __name__ = 'account.dunning.process'
     print_letter = StateReport('account.dunning.letter')
 
@@ -50,8 +48,7 @@ class ProcessDunning:
         return self.next_state('print_letter')
 
 
-class Letter(CompanyReport):
-    __metaclass__ = PoolMeta
+class Letter(CompanyReport, metaclass=PoolMeta):
     __name__ = 'account.dunning.letter'
 
     @classmethod
@@ -97,9 +94,7 @@ class Letter(CompanyReport):
     @staticmethod
     def get_party_letter():
 
-        class PartyLetter(object):
-            __metaclass__ = PoolMeta
-
+        class PartyLetter(object, metaclass=PoolMeta):
             def __init__(self, dunnings, payments):
                 self.dunnings = dunnings
                 self.payments = payments

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,
@@ -121,7 +119,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-    use_2to3=True,
-    convert_2to3_doctests=['tests/scenario_account_dunning_letter.rst'],
     tests_require=tests_require,
     )

tests/scenario_account_dunning_letter.rst

@@ -185,4 +185,4 @@ Process dunning::
     >>> process_dunning.execute('process')
     >>> dunning.reload()
     >>> dunning.state
-    u'done'
+    'done'

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://}