- more merge cleanup

src/App/FactoryDispatcher.py

@@ -25,7 +25,6 @@
 from Acquisition import aq_base
 from ExtensionClass import Base
 from OFS.metaconfigure import get_registered_packages
-from zExceptions import Redirect
 
 
 def _product_packages():

src/OFS/DTMLDocument.py

@@ -13,8 +13,6 @@
 """DTML Document objects.
 """
 
-from six import PY2
-from six import PY3
 from six import binary_type
 from six.moves.urllib.parse import quote
 

src/Products/PageTemplates/ZopePageTemplate.py

@@ -39,7 +39,6 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplateFile import guess_type
 from Products.PageTemplates.utils import convertToUnicode
-from Products.PageTemplates.utils import encodingFromXMLPreamble
 from Shared.DC.Scripts.Script import Script
 from Shared.DC.Scripts.Signature import FuncCode
 from zExceptions import ResourceLockedError

src/Testing/ZopeTestCase/ZopeLite.py

@@ -265,7 +265,6 @@ def startup():
 active = _patched
 
 
-
 def sandbox(base=None):
     '''Returns a sandbox copy of the base ZODB.'''
     if base is None:

src/Testing/tests/test_testbrowser.py

@@ -20,7 +20,6 @@
 from AccessControl.Permissions import view
 from OFS.SimpleItem import Item
 from Testing.testbrowser import Browser
-from Testing.testbrowser import WSGITestApp
 from Testing.ZopeTestCase import FunctionalTestCase
 from Testing.ZopeTestCase import user_name
 from Testing.ZopeTestCase import user_password

src/ZPublisher/tests/testHTTPResponse.py

@@ -4,8 +4,6 @@
 import unittest
 from io import BytesIO
 
-from six import PY3
-
 from zExceptions import BadRequest
 from zExceptions import Forbidden
 from zExceptions import InternalError

src/ZPublisher/tests/test_xmlrpc.py

@@ -9,7 +9,6 @@
     import xmlrpclib
 
 
-
 class FauxResponse(object):
 
     def __init__(self):

src/Zope2/App/tests/test_safe_formatter.py

@@ -1,7 +1,5 @@
 """This module contains integration tests for AccessControl.safe_formatter."""
 
-import unittest
-
 from Testing.ZopeTestCase import FunctionalTestCase
 from zExceptions import Unauthorized