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

issue7497
review53261002
---
 .drone.yml |  6 ------
 CHANGELOG  |  2 ++
 INSTALL    |  2 +-
 setup.py   | 20 +++++++-------------
 stock.py   | 15 +++++----------
 tox.ini    |  6 +++---
 6 files changed, 18 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 b95dc921ad..72f26358c5 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 9d0bd4fb18..496c4fe880 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_package
 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_stock (http://www.tryton.org/)
 
diff --git a/setup.py b/setup.py
index eb4f90c09e..fb4cfa06c7 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 :: Russian',
         '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',
@@ -111,6 +108,7 @@ setup(name=name,
         'Topic :: Office/Business',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -121,8 +119,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_stock_package.rst',
-        ],
     )
diff --git a/stock.py b/stock.py
index 9561b579d2..2fd404ae08 100644
--- a/stock.py
+++ b/stock.py
@@ -10,8 +10,7 @@ __all__ = ['Configuration', 'ConfigurationSequence', 'Package', 'Type', 'Move',
     'ShipmentOut', 'ShipmentInReturn', 'PackageLabel']
 
 
-class Configuration:
-    __metaclass__ = PoolMeta
+class Configuration(metaclass=PoolMeta):
     __name__ = 'stock.configuration'
     package_sequence = fields.MultiValue(fields.Many2One(
             'ir.sequence', "Package Sequence", required=True,
@@ -33,8 +32,7 @@ class Configuration:
             'package_sequence').default_package_sequence()
 
 
-class ConfigurationSequence:
-    __metaclass__ = PoolMeta
+class ConfigurationSequence(metaclass=PoolMeta):
     __name__ = 'stock.configuration.sequence'
     package_sequence = fields.Many2One(
         'ir.sequence', "Package Sequence", required=True,
@@ -136,8 +134,7 @@ class Type(ModelSQL, ModelView):
     name = fields.Char('Name', required=True)
 
 
-class Move:
-    __metaclass__ = PoolMeta
+class Move(metaclass=PoolMeta):
     __name__ = 'stock.move'
     package = fields.Many2One('stock.package', 'Package', select=True)
 
@@ -179,8 +176,7 @@ class PackageMixin(object):
         raise NotImplementedError
 
 
-class ShipmentOut(PackageMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentOut(PackageMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.out'
 
     @classmethod
@@ -210,8 +206,7 @@ class ShipmentOut(PackageMixin, object):
         return (m for m in self.outgoing_moves if m.state != 'cancel')
 
 
-class ShipmentInReturn(PackageMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentInReturn(PackageMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.in.return'
 
     @classmethod
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://}