- fix import sorting

src/Products/PageTemplates/Expressions.py

@@ -18,8 +18,6 @@
 
 import logging
 
-from Products.PageTemplates import ZRPythonExpr
-from Products.PageTemplates.interfaces import IUnicodeEncodingConflictResolver
 from six import binary_type
 from six import text_type
 
@@ -49,6 +47,8 @@
 from zope.traversing.adapters import traversePathElement
 from zope.traversing.interfaces import ITraversable
 
+from . import ZRPythonExpr
+from .interfaces import IUnicodeEncodingConflictResolver
 from .interfaces import IZopeAwareEngine
 
 

src/Products/PageTemplates/engine.py

@@ -20,12 +20,12 @@
 from chameleon.tal import RepeatDict
 from chameleon.tales import DEFAULT_MARKER  # only in chameleon 3.8.0 and up
 from chameleon.zpt.template import Macros
-from z3c.pt.pagetemplate import PageTemplate as ChameleonPageTemplate
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from App.version_txt import getZopeVersion
 from MultiMapping import MultiMapping
+from z3c.pt.pagetemplate import PageTemplate as ChameleonPageTemplate
 from zope.interface import implementer
 from zope.interface import provider
 from zope.pagetemplate.engine import ZopeBaseEngine

src/Products/PageTemplates/expression.py

@@ -8,9 +8,7 @@
 from chameleon.codegen import template
 from chameleon.tales import NotExpr
 from chameleon.tales import StringExpr
-from Products.PageTemplates.Expressions import render
 from six import class_types
-from z3c.pt import expressions
 
 from AccessControl.ZopeGuards import guarded_apply
 from AccessControl.ZopeGuards import guarded_getattr
@@ -20,13 +18,15 @@
 from OFS.interfaces import ITraversable
 from RestrictedPython import RestrictingNodeTransformer
 from RestrictedPython.Utilities import utility_builtins
+from z3c.pt import expressions
 from zExceptions import NotFound
 from zExceptions import Unauthorized
 from zope.interface import implementer
 from zope.tales.tales import ExpressionEngine
 from zope.traversing.adapters import traversePathElement
 from zope.traversing.interfaces import TraversalError
 
+from .Expressions import render
 from .interfaces import IZopeAwareEngine