Update test setup.

src/grokcore/content/tests/test_container.py

@@ -12,7 +12,7 @@
     >>> from zope.container.btree import BTreeContainer
     >>> isinstance(bag, BTreeContainer)
     True
-     
+
 We had problems when switching to grokcore.content.Container
 with the __parent__ attribute being set, we better make sure
 this doesn't happen again:
@@ -32,17 +32,17 @@
 
 from grokcore.content import Model, Container
 
+
 class BoneBag(Container):
     pass
-
+
+
 class Bone(Model):
     pass
 
 
-
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     suite = doctest.DocTestSuite(
-        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
-        )
+        optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
     return suite

src/grokcore/content/tests/test_container_event.py

@@ -29,27 +29,31 @@
 from grokcore.content import Model, OrderedContainer
 from zope.container.interfaces import IContainerModifiedEvent
 
+
 class OrderedBones(OrderedContainer):
     pass
 
+
 class Bone(Model):
     def __init__(self, name):
         self.name = name
 
+
 @subscribe(OrderedBones, IContainerModifiedEvent)
 def container_changed(object, event):
     print 'Container has changed!'
 
 
 def test_suite():
+    import doctest
     import zope.component.eventtesting
-    from zope.testing import doctest, cleanup
+    from zope.testing import cleanup
 
     def cleanUp(test):
         cleanup.cleanUp()
-    
+
     suite = doctest.DocTestSuite(
-        setUp=zope.component.eventtesting.setUp, tearDown=cleanUp,
-        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
-        )
+        setUp=zope.component.eventtesting.setUp,
+        tearDown=cleanUp,
+        optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
     return suite

src/grokcore/content/tests/test_orderedcontainer.py

@@ -86,17 +86,18 @@
 
 from grokcore.content import Model, OrderedContainer
 
+
 class OrderedBones(OrderedContainer):
     pass
 
+
 class Bone(Model):
     def __init__(self, name):
         self.name = name
 
 
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     suite = doctest.DocTestSuite(
-        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
-        )
+        optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
     return suite

src/grokcore/content/tests/test_verify_containers.py

@@ -37,9 +37,9 @@
 
 """
 
+
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     suite = doctest.DocTestSuite(
-        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
-        )
+        optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
     return suite