Stop importing DocTestSuite from zope.testing.doctestunit.

This fixes compatibility problems with zope.testing 3.8.4.

CHANGES.txt

@@ -7,6 +7,9 @@ CHANGES
 
 - Removed no longer used zcml prefix from the configure file.
 
+- Stop importing DocTestSuite from zope.testing.doctestunit.  Fixes
+  compatibility problems with zope.testing 3.8.4.
+
 3.10.0 (2009-12-15)
 -------------------
 

src/zope/container/tests/test_btree.py

@@ -17,7 +17,7 @@ $Id$
 """
 from unittest import TestCase, main, makeSuite, TestSuite
 from zope.interface.verify import verifyObject
-from zope.testing.doctestunit import DocTestSuite
+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_ordered.py

@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 from zope.component.eventtesting import getEvents, clearEvents
 from zope.container import testing