- Drop support for Python 2.7, 3.5, 3.6

Author: dataflake

.github/workflows/tests.yml

@@ -21,9 +21,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"]
         - ["3.9",   "py39"]
@@ -57,7 +54,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,10 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "d6240444ec6c9e203f2fd9f62c3e6038f9189e96"
+commit-id = "e5c611fb"
 
 [python]
 with-pypy = false
-with-legacy-python = true
 with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
@@ -17,7 +16,6 @@ fail-under = 83
 
 [manifest]
 additional-rules = [
-    "include buildout4.cfg",
     "include src/Products/PythonScripts/www/default_content",
     "recursive-include src *.dtml",
     "recursive-include src *.pkl",

MANIFEST.in

@@ -7,7 +7,6 @@ include buildout.cfg
 include tox.ini
 
 recursive-include src *.py
-include buildout4.cfg
 include src/Products/PythonScripts/www/default_content
 recursive-include src *.dtml
 recursive-include src *.pkl

setup.cfg

@@ -1,7 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [flake8]
 doctests = 1
@@ -17,7 +17,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = six, docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE

setup.py

@@ -29,34 +29,29 @@
       description='Provides support for restricted execution of Python '
                   'scripts in Zope.',
       author='Zope Foundation and Contributors',
-      author_email='zope-dev@zope.org',
-      long_description=('%s\n%s' % (open('README.rst').read(),
-                                    open('CHANGES.rst').read())),
+      author_email='zope-dev@zope.dev',
+      long_description=('{}\n{}'.format(open('README.rst').read(),
+                                        open('CHANGES.rst').read())),
       packages=find_packages('src'),
       namespace_packages=['Products'],
       package_dir={'': 'src'},
       classifiers=[
           'Development Status :: 6 - Mature',
           'Environment :: Web Environment',
           'Framework :: Zope',
-          'Framework :: Zope :: 4',
           'Framework :: Zope :: 5',
           'License :: OSI Approved :: Zope Public License',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
           'Programming Language :: Python :: Implementation :: CPython',
       ],
-      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
+      python_requires='>=3.7',
       install_requires=[
           'setuptools',
           'AccessControl',

src/Products/PythonScripts/PythonScript.py

@@ -16,15 +16,14 @@
 Python code.
 """
 
+import importlib.util
 import marshal
 import os
 import re
 import sys
 import types
 from logging import getLogger
-
-import six
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import change_proxy_roles
@@ -47,24 +46,14 @@
 from Shared.DC.Scripts.Script import Script
 from Shared.DC.Scripts.Script import defaultBindings
 from zExceptions import Forbidden
+from zExceptions import ResourceLockedError
 from ZPublisher.HTTPRequest import default_encoding
 
 
-try:
-    from zExceptions import ResourceLockedError
-except ImportError:
-    from webdav.Lockable import ResourceLockedError
-
 LOG = getLogger('PythonScripts')
 
 # Track the Python bytecode version
-try:
-    import importlib.util
-    Python_magic = importlib.util.MAGIC_NUMBER
-except ImportError:  # Python 2
-    import imp
-    Python_magic = imp.get_magic()
-    del imp
+Python_magic = importlib.util.MAGIC_NUMBER
 
 # This should only be incremented to force recompilation.
 Script_magic = 4
@@ -103,7 +92,7 @@ def manage_addPythonScript(self, id, title='', file=None, REQUEST=None,
         except Exception:
             u = REQUEST['URL1']
         if submit == 'Add and Edit':
-            u = '%s/%s' % (u, quote(id))
+            u = f'{u}/{quote(id)}'
         REQUEST.RESPONSE.redirect(u + '/manage_main')
     return ''
 
@@ -288,7 +277,7 @@ def _newfun(self, code):
         safe_globals['__name__'] = 'script'
 
         safe_locals = {}
-        six.exec_(code, safe_globals, safe_locals)
+        exec(code, safe_globals, safe_locals)
         func = list(safe_locals.values())[0]
         self._v_ft = (func.__code__, safe_globals, func.__defaults__ or ())
         return func
@@ -332,7 +321,7 @@ def _exec(self, bound_names, args, kw):
         if ft is None:
             __traceback_supplement__ = (
                 PythonScriptTracebackSupplement, self)
-            raise RuntimeError('%s %s has errors.' % (self.meta_type, self.id))
+            raise RuntimeError(f'{self.meta_type} {self.id} has errors.')
 
         function_code, safe_globals, function_argument_definitions = ft
         safe_globals = safe_globals.copy()
@@ -433,10 +422,8 @@ def write(self, text):
         bindmap = self.getBindingAssignments().getAssignedNames()
         bup = 0
 
-        if six.PY3 and isinstance(text, bytes):
+        if isinstance(text, bytes):
             text = text.decode(default_encoding)
-        elif six.PY2 and not isinstance(text, bytes):
-            text = text.encode(default_encoding)
 
         st = 0
         try:
@@ -520,7 +507,7 @@ def read(self):
         else:
             prefix = '##'
 
-        hlines = ['%s %s "%s"' % (prefix, self.meta_type, self.id)]
+        hlines = [f'{prefix} {self.meta_type} "{self.id}"']
         mm = sorted(self._metadata_map().items())
         for kv in mm:
             hlines.append('%s=%s' % kv)
@@ -553,7 +540,7 @@ def get_size(self):
     @security.protected(view_management_screens)
     def PrincipiaSearchSource(self):
         """Support for searching - the document's contents are searched."""
-        return '%s\n%s' % (self._params, self._body)
+        return f'{self._params}\n{self._body}'
 
     @security.protected(view_management_screens)
     def document_src(self, REQUEST=None, RESPONSE=None):

src/Products/PythonScripts/standard.py

@@ -18,7 +18,7 @@
 "import Products.PythonScripts.standard"
 """
 
-from six.moves.urllib.parse import urlencode  # NOQA
+from urllib.parse import urlencode  # NOQA
 
 from AccessControl.SecurityInfo import ModuleSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager

src/Products/PythonScripts/tests/testBindings.py

@@ -21,7 +21,7 @@
 from OFS.ObjectManager import ObjectManager
 
 
-class UnderprivilegedUser(object):
+class UnderprivilegedUser:
 
     def getId(self):
         return 'underprivileged'