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

issue7497
review53261002
---
 .drone.yml  |  6 ------
 CHANGELOG   |  2 ++
 INSTALL     |  2 +-
 purchase.py |  3 +--
 setup.py    | 20 +++++++-------------
 tox.ini     |  6 +++---
 work.py     |  9 ++++-----
 7 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 1a59120822..6c6e42f792 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 04b0425387..0066dbe7c0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project_revenue
 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_project (http://www.tryton.org/)
  * trytond_timesheet (http://www.tryton.org/)
diff --git a/purchase.py b/purchase.py
index e6dcae0192..5dee714926 100644
--- a/purchase.py
+++ b/purchase.py
@@ -7,8 +7,7 @@ from trytond.pyson import Eval
 __all__ = ['PurchaseLine']
 
 
-class PurchaseLine:
-    __metaclass__ = PoolMeta
+class PurchaseLine(metaclass=PoolMeta):
     __name__ = 'purchase.line'
 
     work = fields.Many2One('project.work', 'Work Effort', select=True,
diff --git a/setup.py b/setup.py
index 4009d212a7..046995a99a 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',
@@ -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_project_revenue.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://}
diff --git a/work.py b/work.py
index 7d34e4706a..3eee261be6 100644
--- a/work.py
+++ b/work.py
@@ -17,8 +17,7 @@ from trytond.modules.product import price_digits
 __all__ = ['Work']
 
 
-class Work:
-    __metaclass__ = PoolMeta
+class Work(metaclass=PoolMeta):
     __name__ = 'project.work'
     product = fields.Many2One('product.product', 'Product',
         domain=[
@@ -89,7 +88,7 @@ class Work:
 
         # Purchase cost
         if hasattr(cls, 'purchase_lines'):
-            for work_id, cost in cls._purchase_cost(works).iteritems():
+            for work_id, cost in cls._purchase_cost(works).items():
                 costs[work_id] += cost
 
         for work in works:
@@ -136,10 +135,10 @@ class Work:
                     where=where))
             work2currency.update(cursor.fetchall())
 
-        currencies = Currency.browse(set(work2currency.itervalues()))
+        currencies = Currency.browse(set(work2currency.values()))
         id2currency = {c.id: c for c in currencies}
 
-        invoice_lines = InvoiceLine.browse(iline2work.keys())
+        invoice_lines = InvoiceLine.browse(list(iline2work.keys()))
         for invoice_line in invoice_lines:
             invoice = invoice_line.invoice
             work_id = iline2work[invoice_line.id]