Prefer the standard libraries doctest module to the one from zope.testing.

CHANGES.txt

@@ -5,13 +5,15 @@ CHANGES
 3.11.1 (unreleased)
 -------------------
 
+- Prefer the standard libraries doctest module to the one from zope.testing.
+
 - Added compatibility with ZODB3 3.10 by importing the IBroken interface from
   it directly. Once we can rely on the new ZODB3 version exclusively, we can
   remove the dependency onto the zope.broken distribution.
 
-- never fail if the suggested name is in a wrong type (#227617)
+- Never fail if the suggested name is in a wrong type (#227617)
 
-- checkName first checks the parameter type before the emptiness
+- ``checkName`` first checks the parameter type before the emptiness.
 
 3.11.0 (2009-12-31)
 -------------------

src/zope/container/tests/test_btree.py

@@ -15,9 +15,9 @@
 
 $Id$
 """
+from doctest import DocTestSuite
 from unittest import TestCase, main, makeSuite, TestSuite
 from zope.interface.verify import verifyObject
-from zope.testing.doctest import DocTestSuite
 from zope.component.testing import setUp, tearDown
 from zope.container.tests.test_icontainer import TestSampleContainer
 from zope.container.btree import BTreeContainer

src/zope/container/tests/test_constraints.py

@@ -15,8 +15,10 @@
 
 $Id$
 """
+
+import doctest
 import unittest
-from zope.testing import doctest, module
+from zope.testing import module
 
 def setUp(test):
     module.setUp(test, 'zope.container.constraints_txt')

src/zope/container/tests/test_contained.py

@@ -15,8 +15,11 @@
 
 $Id$
 """
-import unittest
+
+import doctest
 import gc
+import unittest
+
 from ZODB.DemoStorage import DemoStorage
 from ZODB.DB import DB
 import transaction
@@ -24,7 +27,6 @@ from persistent import Persistent
 
 import zope.interface
 import zope.component
-from zope.testing import doctest
 
 from zope.container.contained import ContainedProxy, NameChooser
 from zope.container.sample import SampleContainer

src/zope/container/tests/test_directory.py

@@ -15,12 +15,14 @@
 
 $Id$
 """
+
+import doctest
 from unittest import TestCase, TestSuite, main, makeSuite
-from zope.testing import doctest
-from zope.container import testing
 
+from zope.container import testing
 import zope.container.directory
 
+
 class Directory(object):
     pass
  

src/zope/container/tests/test_ordered.py

@@ -16,10 +16,12 @@
 $Id$
 """
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
+
 from zope.component.eventtesting import getEvents, clearEvents
 from zope.container import testing
 
+
 def test_order_events():
     """
     Prepare the setup::