- after-merge cleanup

zopefoundation · Mar 24, 2019 · 9313a98 · 9313a98
1 parent b92c7b3
commit 9313a98
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/src/Products/PageTemplates/ZopePageTemplate.py b/src/Products/PageTemplates/ZopePageTemplate.py
@@ -45,7 +45,6 @@
 from zExceptions import ResourceLockedError
 
 
-
 preferred_encodings = ['utf-8', 'iso-8859-15']
 if 'ZPT_PREFERRED_ENCODING' in os.environ:
     preferred_encodings.insert(0, os.environ['ZPT_PREFERRED_ENCODING'])

diff --git a/src/Products/PageTemplates/tests/testZopePageTemplate.py b/src/Products/PageTemplates/tests/testZopePageTemplate.py
@@ -31,7 +31,6 @@
 from zope.traversing.adapters import DefaultTraversable
 
 
-
 ascii_binary = b'<html><body>hello world</body></html>'
 iso885915_binary = u'<html><body>üöäÜÖÄß</body></html>'.encode('iso-8859-15')
 utf8_text = iso885915_binary.decode('iso-8859-15').encode('utf-8')

diff --git a/src/Testing/ZopeTestCase/zopedoctest/functional.py b/src/Testing/ZopeTestCase/zopedoctest/functional.py
@@ -19,8 +19,8 @@
 import sys
 import warnings
 from doctest import ELLIPSIS
-from doctest import REPORT_NDIFF
 from doctest import NORMALIZE_WHITESPACE
+from doctest import REPORT_NDIFF
 from functools import partial
 from io import BytesIO
 

diff --git a/src/ZPublisher/utils.py b/src/ZPublisher/utils.py
@@ -23,7 +23,6 @@
 from Acquisition import aq_parent
 
 
-
 AC_LOGGER = logging.getLogger('event.AccessControl')
 
 

diff --git a/src/Zope2/App/tests/test_safe_formatter.py b/src/Zope2/App/tests/test_safe_formatter.py
@@ -5,6 +5,7 @@
 from Testing.ZopeTestCase import FunctionalTestCase
 from zExceptions import Unauthorized
 
+
 try:
     from html import escape
     import functools

diff --git a/src/Zope2/Startup/serve.py b/src/Zope2/Startup/serve.py
@@ -23,6 +23,7 @@
 from paste.deploy import loadapp
 from paste.deploy import loadserver
 
+
 try:
     import configparser
 except ImportError: