Add support for Python 3.11.

* isort imports.

CHANGES.rst

@@ -5,7 +5,7 @@
 5.3 (unreleased)
 ================
 
-- Nothing changed yet.
+- Add support for Python 3.11.
 
 
 5.2 (2022-08-24)

setup.py

@@ -19,7 +19,9 @@
 """Setup for zope.tales package
 """
 import os
-from setuptools import setup, find_packages
+
+from setuptools import find_packages
+from setuptools import setup
 
 
 def read(*rnames):
@@ -61,6 +63,7 @@ def read(*rnames):
         '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',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',

src/zope/tales/engine.py

@@ -15,14 +15,14 @@
 
 Each expression engine can have its own expression types and base names.
 """
-from zope.tales.tales import ExpressionEngine
-from zope.tales.expressions import PathExpr
-from zope.tales.expressions import StringExpr
-from zope.tales.expressions import NotExpr
 from zope.tales.expressions import DeferExpr
 from zope.tales.expressions import LazyExpr
+from zope.tales.expressions import NotExpr
+from zope.tales.expressions import PathExpr
 from zope.tales.expressions import SimpleModuleImporter
+from zope.tales.expressions import StringExpr
 from zope.tales.pythonexpr import PythonExpr
+from zope.tales.tales import ExpressionEngine
 
 
 def DefaultEngine():

src/zope/tales/expressions.py

@@ -28,8 +28,14 @@
 import six
 
 from zope.interface import implementer
-from zope.tales.tales import _valid_name, _parse_expr, NAME_RE, Undefined
-from zope.tales.interfaces import ITALESExpression, ITALESFunctionNamespace
+
+from zope.tales.interfaces import ITALESExpression
+from zope.tales.interfaces import ITALESFunctionNamespace
+from zope.tales.tales import NAME_RE
+from zope.tales.tales import Undefined
+from zope.tales.tales import _parse_expr
+from zope.tales.tales import _valid_name
+
 
 Undefs = (Undefined, AttributeError, LookupError, TypeError)
 

src/zope/tales/interfaces.py

@@ -16,6 +16,7 @@
 """
 from zope.interface import Interface
 
+
 try:
     from zope.tal.interfaces import ITALIterator
 except ImportError:

src/zope/tales/tales.py

@@ -17,15 +17,17 @@
 """
 import re
 
+
 try:
     from html import escape
 except ImportError:  # pragma: PY2
     from cgi import escape
 
-from zope.interface import implementer
-from zope.interface import Interface
 import six
 
+from zope.interface import Interface
+from zope.interface import implementer
+
 from zope.tales.interfaces import ITALESIterator
 
 
@@ -43,9 +45,9 @@ class ITALExpressionErrorInfo(Interface):
 
 try:
     # Override with real, if present
-    from zope.tal.interfaces import (ITALExpressionEngine,  # noqa: F811
-                                     ITALExpressionCompiler,
-                                     ITALExpressionErrorInfo)
+    from zope.tal.interfaces import ITALExpressionCompiler  # noqa: F811
+    from zope.tal.interfaces import ITALExpressionEngine  # noqa: F811
+    from zope.tal.interfaces import ITALExpressionErrorInfo  # noqa: F811
 except ImportError:
     pass
 

src/zope/tales/tests/__init__.py

@@ -1,6 +1,7 @@
-import six
 import unittest
 
+import six
+
 
 class TestCase(unittest.TestCase):
     """Base test case for Python version compatibility."""

src/zope/tales/tests/test_expressions.py

@@ -14,14 +14,17 @@
 ##############################################################################
 """Default TALES expression implementations tests.
 """
-import six
 import unittest
 
+import six
+
+from zope.interface import implementer
+
+import zope.tales.tests
 from zope.tales.engine import Engine
 from zope.tales.interfaces import ITALESFunctionNamespace
 from zope.tales.tales import Undefined
-from zope.interface import implementer
-import zope.tales.tests
+
 
 text_type = str if str is not bytes else unicode  # noqa PY2
 
@@ -341,8 +344,8 @@ def check(expr):
         check('string:foo${ab/cd | c/d | e/f/}bar')
 
     def test_defer_expression_returns_wrapper(self):
-        from zope.tales.expressions import DeferWrapper
         from zope.tales.expressions import DeferExpr
+        from zope.tales.expressions import DeferWrapper
         expr = self.engine.compile('defer: B')
         self.assertIsInstance(expr, DeferExpr)
         self.assertEqual(str(expr), "<DeferExpr 'B'>")
@@ -361,8 +364,8 @@ def test_eval_defer_wrapper(self):
         self._check_evals_to('deferred', self.context.vars['b'])
 
     def test_lazy_expression_returns_wrapper(self):
-        from zope.tales.expressions import LazyWrapper
         from zope.tales.expressions import LazyExpr
+        from zope.tales.expressions import LazyWrapper
         expr = self.engine.compile('lazy: b')
         self.assertIsInstance(expr, LazyExpr)
         self.assertEqual(repr(expr), "lazy:'b'")
@@ -393,8 +396,9 @@ def test_bad_initial_name_subexpr(self):
         )
 
     def test_builtins_in_path(self):
+        from ..expressions import PathExpr
+        from ..expressions import SubPathExpr
         from ..tales import ExpressionEngine
-        from ..expressions import PathExpr, SubPathExpr
 
         class MySubPathExpr(SubPathExpr):
             ALLOWED_BUILTINS = {'True': True, 'False': False, 'x': None}

src/zope/tales/tests/test_pythonexpr.py

@@ -12,14 +12,14 @@
 #
 ##############################################################################
 
-import six
 import unittest
 
-from zope.tales.engine import Engine
-from zope.tales.tales import Context
+import six
 
-from zope.tales.pythonexpr import PythonExpr
+from zope.tales.engine import Engine
 from zope.tales.pythonexpr import ExprTypeProxy
+from zope.tales.pythonexpr import PythonExpr
+from zope.tales.tales import Context
 
 
 class TestPythonExpr(unittest.TestCase):

src/zope/tales/tests/test_tales.py

@@ -13,16 +13,18 @@
 ##############################################################################
 """TALES Tests
 """
-from doctest import DocTestSuite
-import unittest
 import re
 import sys
+import unittest
+from doctest import DocTestSuite
 
 import six
-from zope.tales import tales
-from zope.tales.tests.simpleexpr import SimpleExpr
+
 from zope.testing import renormalizing
+
 import zope.tales.tests
+from zope.tales import tales
+from zope.tales.tests.simpleexpr import SimpleExpr
 
 
 class TestIterator(unittest.TestCase):

src/zope/tales/tests/test_traverser.py

@@ -14,6 +14,7 @@
 """ Tests for zope.tales.expressions.simpleTraverse
 """
 from unittest import TestCase
+
 from zope.tales.expressions import simpleTraverse