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)
 

INSTALL

@@ -4,7 +4,7 @@ Installing trytond_sale_stock_quantity
 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/)
  * trytond_product (http://www.tryton.org/)

sale.py

@@ -1,6 +1,6 @@
 # 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 itertools import ifilter
+
 import datetime
 
 from trytond.pool import PoolMeta, Pool
@@ -12,8 +12,7 @@ from trytond.tools import grouped_slice
 __all__ = ['Sale']
 
 
-class Sale:
-    __metaclass__ = PoolMeta
+class Sale(metaclass=PoolMeta):
     __name__ = 'sale.sale'
 
     @classmethod
@@ -108,7 +107,7 @@ class Sale:
                     with_childs=True,
                     grouping_filter=(product_ids,))
             delta = {}
-            for key, qty in pbl.iteritems():
+            for key, qty in pbl.items():
                 _, product_id = key
                 delta[product_id] = qty
             date2delta[date] = delta
@@ -124,7 +123,7 @@ class Sale:
 
         today = Date.today()
         sale_date = self.sale_date or today
-        product_ids = {l.product.id for l in ifilter(filter_line, self.lines)}
+        product_ids = {l.product.id for l in filter(filter_line, self.lines)}
         product_ids = list(product_ids)
 
         # The product must be available at least the day before
@@ -162,7 +161,7 @@ class Sale:
                     product.default_uom, round=False)
                 quantities[product] -= quantity
 
-        for line in ifilter(filter_line, self.lines):
+        for line in filter(filter_line, self.lines):
             product = line.product
             quantity = Uom.compute_qty(line.unit, line.quantity,
                 product.default_uom, round=False)

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'))
@@ -106,7 +104,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',
@@ -115,6 +112,7 @@ setup(name=name,
         'Topic :: Office/Business',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -125,8 +123,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_sale_stock_quantity.rst',
-        ],
     )

tests/scenario_sale_stock_quantity.rst

@@ -98,7 +98,7 @@ Create an Inventory of 5 products::
     >>> inventory_line.expected_quantity = 0.0
     >>> inventory.click('confirm')
     >>> inventory.state
-    u'done'
+    'done'
 
 Sale 3 products with enough stock::
 
@@ -162,7 +162,7 @@ Make an inventory of 3 products in 2 days::
     >>> inventory_line.expected_quantity = 5.0
     >>> inventory.click('confirm')
     >>> inventory.state
-    u'done'
+    'done'
 
 Sale 4 products with not enough forecast::
 

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