Drop support for Python 2.7 and 3.5. (#226)

This is needed to support Python 3.11 in a clear way.
No longer use `coverage-python-version` so `coverage >= 6` is used.

Author: Michael Howitz

.github/workflows/tests.yml

@@ -22,8 +22,6 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.9",   "lint"]
-        - ["2.7",   "py27"]
-        - ["3.5",   "py35"]
         - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
@@ -63,7 +61,7 @@ jobs:
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
-        pip install coveralls coverage-python-version
+        pip install coveralls
         coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.meta.toml

@@ -2,11 +2,11 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "3a251aab94eff9cf2aa2fd87d7266593251e4b76"
+commit-id = "387516cfda91ee38cde868ef0d6205314a6a9bef"
 
 [python]
 with-pypy = false
-with-legacy-python = true
+with-legacy-python = false
 with-docs = true
 with-sphinx-doctests = true
 with-windows = true
@@ -22,7 +22,6 @@ testenv-deps = [
     "datetime: DateTime",
     "-cconstraints.txt",
     "pytest-cov",
-    "coverage-python-version",
     ]
 testenv-setenv = [
     "COVERAGE_FILE=.coverage.{envname}",
@@ -40,7 +39,6 @@ testenv-additional = [
     "    mkdir",
     "deps =",
     "    coverage",
-    "    coverage-python-version",
     "    -cconstraints.txt",
     "setenv =",
     "    COVERAGE_FILE=.coverage",
@@ -49,7 +47,7 @@ testenv-additional = [
     "    coverage combine",
     "    coverage html",
     "    coverage report -m --fail-under=100",
-    "depends = py27,py35,py36,py37,py38,py39,py39-datetime,py310,coverage",
+    "depends = py36,py37,py38,py39,py39-datetime,py310,py311,coverage",
     ]
 coverage-basepython = "python3.8"
 coverage-command = "pytest --cov=src --cov=tests --cov-report= {posargs}"

CHANGES.rst

@@ -1,9 +1,17 @@
 Changes
 =======
 
-5.3 (unreleased)
+6.0 (unreleased)
 ----------------
 
+Backwards incompatible changes
+++++++++++++++++++++++++++++++
+
+- Drop support for Python 2.7 and 3.5.
+
+Features
+++++++++
+
 - Allow to use the package with Python 3.11 -- Caution: No security audit has
   been done so far.
 

constraints.txt

@@ -1,13 +1,6 @@
-# Constraints for Python Packages
-# -----------------------------------------------
-# Pin Versions / Version Ranges if necessary.
+# Constraints for Python packages
+# -------------------------------
+# Pin versions / version ranges if necessary.
 isort >= 4.3.2
-# Needed for Appveyor as long as PY2 is supported:
-pytest < 5 ; python_version < '3.11'
-# Python 3.11 needs pytest > 5
-pytest >= 5 ; python_version >= '3.11'
-# coverage 6+ no longer supports Python 2 and coverage results of older
-# versions cannot not combined with newer ones:
-coverage < 6; python_version < '3.11'
-# Python 3.11 requires coverage >= 6,
-coverage >= 6; python_version >= '3.11'
+pytest >= 5
+coverage >= 6

setup.cfg

@@ -1,7 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [flake8]
 doctests = 1

setup.py

@@ -32,7 +32,7 @@ def read(*rnames):
 
 setup(
     name='RestrictedPython',
-    version='5.3.dev0',
+    version='6.0.dev0',
     url='https://github.com/zopefoundation/RestrictedPython',
     license='ZPL 2.1',
     description=(
@@ -46,10 +46,8 @@ def read(*rnames):
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
@@ -70,7 +68,7 @@ def read(*rnames):
     package_dir={'': 'src'},
     install_requires=[
     ],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.12",  # NOQA: E501
+    python_requires=">=3.6, <3.12",
     tests_require=tests_require,
     extras_require={
         'test': tests_require,

src/RestrictedPython/Eval.py

@@ -14,17 +14,10 @@
 
 import ast
 
-from ._compat import IS_PY2
 from .compile import compile_restricted_eval
 
 
-if IS_PY2:  # pragma: PY2
-    from string import maketrans
-else:  # pragma: PY3
-    maketrans = str.maketrans
-
-
-nltosp = maketrans('\r\n', '  ')
+nltosp = str.maketrans('\r\n', '  ')
 
 # No restrictions.
 default_guarded_getattr = getattr
@@ -40,7 +33,7 @@ def default_guarded_getiter(ob):
     return ob
 
 
-class RestrictionCapableEval(object):
+class RestrictionCapableEval:
     """A base class for restricted code."""
 
     globals = {'__builtins__': None}

src/RestrictedPython/Guards.py

@@ -15,19 +15,13 @@
 # AccessControl.ZopeGuards contains a large set of wrappers for builtins.
 # DocumentTemplate.DT_UTil contains a few.
 
-from RestrictedPython import _compat
+import builtins
 
 
-if _compat.IS_PY2:  # pragma: PY2
-    import __builtin__ as builtins
-else:  # pragma: PY3
-    # Do not attempt to use this package on Python2.7 as there
-    # might be backports for this package such as future.
-    import builtins
-
 safe_builtins = {}
 
 _safe_names = [
+    '__build_class__',
     'None',
     'False',
     'True',
@@ -109,23 +103,6 @@
     'ZeroDivisionError',
 ]
 
-if _compat.IS_PY2:  # pragma: PY2
-    _safe_names.extend([
-        'basestring',
-        'cmp',
-        'long',
-        'unichr',
-        'unicode',
-        'xrange',
-    ])
-    _safe_exceptions.extend([
-        'StandardError',
-    ])
-else:  # pragma: PY3
-    _safe_names.extend([
-        '__build_class__',  # needed to define new classes
-    ])
-
 for name in _safe_names:
     safe_builtins[name] = getattr(builtins, name)
 
@@ -202,7 +179,7 @@ def handler(self, *args):
             f(*args)
         return handler
 
-    class Wrapper(object):
+    class Wrapper:
         def __init__(self, ob):
             self.__dict__['ob'] = ob
 
@@ -264,7 +241,7 @@ def safer_getattr(object, name, default=None, getattr=getattr):
     http://lucumr.pocoo.org/2016/12/29/careful-with-str-format/
 
     """
-    if isinstance(object, _compat.basestring) and name == 'format':
+    if isinstance(object, str) and name == 'format':
         raise NotImplementedError(
             'Using format() on a %s is not safe.' % object.__class__.__name__)
     if name.startswith('_'):

src/RestrictedPython/PrintCollector.py

@@ -10,10 +10,9 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-from __future__ import print_function
 
 
-class PrintCollector(object):
+class PrintCollector:
     """Collect written text, and return it when called."""
 
     def __init__(self, _getattr_=None):

src/RestrictedPython/Utilities.py

@@ -27,7 +27,7 @@
 
 try:
     import DateTime
-    utility_builtins['DateTime'] = DateTime.DateTime  # pragma: no cover
+    utility_builtins['DateTime'] = DateTime.DateTime
 except ImportError:
     pass