Update imports.

zopefoundation · Jan 12, 2016 · c4d7372 · c4d7372
1 parent 656f9c5
commit c4d7372
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/src/grokcore/view/ftests/test_functional.py b/src/grokcore/view/ftests/test_functional.py
@@ -1,30 +1,33 @@
+import doctest
+import os.path
 import re
 import unittest
-import os.path
-import grokcore.view
-
 from pkg_resources import resource_listdir
 
 from zope.app.wsgi.testlayer import BrowserLayer, http
-from zope.testing import doctest, renormalizing
+from zope.testing import renormalizing
+import grokcore.view
 
 
 FunctionalLayer = BrowserLayer(grokcore.view)
 
+
 checker = renormalizing.RENormalizing([
     # Accommodate to exception wrapping in newer versions of mechanize
     (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
     ])
 
+
 def suiteFromPackage(name):
     files = resource_listdir(__name__, name)
     suite = unittest.TestSuite()
     getRootFolder = FunctionalLayer.getRootFolder
     globs = dict(http=http,
                  getRootFolder=getRootFolder)
-    optionflags = (doctest.ELLIPSIS+
-                   doctest.NORMALIZE_WHITESPACE+
-                   doctest.REPORT_NDIFF)
+    optionflags = (
+        doctest.ELLIPSIS +
+        doctest.NORMALIZE_WHITESPACE +
+        doctest.REPORT_NDIFF)
 
     for filename in files:
         if filename == '__init__.py':
@@ -49,14 +52,14 @@ def suiteFromPackage(name):
             suite.addTest(test)
     return suite
 
+
 def test_suite():
     suite = unittest.TestSuite()
     for name in [
-        'contentprovider',
-        'directoryresource',
-        'static',
-        'url',
-        'view',
-        ]:
+            'contentprovider',
+            'directoryresource',
+            'static',
+            'url',
+            'view']:
         suite.addTest(suiteFromPackage(name))
     return suite
diff --git a/src/grokcore/view/tests/test_all.py b/src/grokcore/view/tests/test_all.py
@@ -1,31 +1,34 @@
-
+import doctest
 import os
 import re
 import unittest
 from pkg_resources import resource_listdir
 
-from zope.testing import doctest, cleanup, renormalizing
+from zope.testing import cleanup, renormalizing
 import zope.component.eventtesting
 
 import grokcore.view
 from grokcore.view.templatereg import file_template_registry
 
 optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
 
+
 def setUp(test):
     zope.component.eventtesting.setUp(test)
     file_template_registry.ignore_templates('.svn')
 
+
 def cleanUp(test):
     cleanup.cleanUp()
 
 checker = renormalizing.RENormalizing([
     # str(Exception) has changed from Python 2.4 to 2.5 (due to
     # Exception now being a new-style class).  This changes the way
     # exceptions appear in traceback printouts.
-    (re.compile(r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
-                r'ConfigurationExecutionError: \1:'),
-    ])
+    (re.compile(
+        r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
+        r'ConfigurationExecutionError: \1:'), ])
+
 
 def suiteFromPackage(name):
     files = resource_listdir(__name__, name)
@@ -55,15 +58,15 @@ def suiteFromPackage(name):
             suite.addTest(test)
     return suite
 
+
 def test_suite():
     suite = unittest.TestSuite()
     for name in [
-        'contentprovider',
-        'directoryresource',
-        'skin',
-        'template',
-        'view',
-        ]:
+            'contentprovider',
+            'directoryresource',
+            'skin',
+            'template',
+            'view']:
         suite.addTest(suiteFromPackage(name))
     suite.addTest(doctest.DocFileSuite(
         '../templatereg.txt',