Use the standard Python doctest module instead of zope.testing.doctest, which

has been deprecated.

8 files changed, 18 insertions, 15 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 32eda3e..46e8fc5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,11 @@ CHANGES
 *******
 
 ==================
-3.5.4 (unreleased)
+3.5.4 (2009-12-23)
 ==================
 
-- Fixed unit tests replacing zope.testing.doctestunit with doctest: it has been
-  deprecated.
+- Use the standard Python doctest module instead of zope.testing.doctest, which
+  has been deprecated.
 
 
 3.5.3 (2009-12-08)
diff --git a/setup.py b/setup.py
index c7dce40..98a682f 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ class optional_build_ext(build_ext):
 
 
 setup(name='zope.interface',
-      version = '3.5.4dev',
+      version = '3.5.4',
       url='http://pypi.python.org/pypi/zope.interface',
       license='ZPL 2.1',
       description='Interfaces for Python',
diff --git a/src/zope/interface/common/tests/test_import_interfaces.py b/src/zope/interface/common/tests/test_import_interfaces.py
index 2df7721..1766162 100644
--- a/src/zope/interface/common/tests/test_import_interfaces.py
+++ b/src/zope/interface/common/tests/test_import_interfaces.py
@@ -11,8 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+import doctest
 import unittest
-from zope.testing import doctest
 
 def test_interface_import():
     """
diff --git a/src/zope/interface/tests/test_adapter.py b/src/zope/interface/tests/test_adapter.py
index c692231..74987ff 100644
--- a/src/zope/interface/tests/test_adapter.py
+++ b/src/zope/interface/tests/test_adapter.py
@@ -15,6 +15,7 @@
 
 $Id$
 """
+import doctest
 import unittest
 import zope.interface
 from zope.interface.adapter import AdapterRegistry
@@ -402,7 +403,6 @@ def test_unsubscribe_cleans_up_empties():
 
 
 def test_suite():
-    from zope.testing import doctest
     return unittest.TestSuite((
         doctest.DocFileSuite('../adapter.txt', '../adapter.ru.txt',
                                  '../human.txt', '../human.ru.txt',
diff --git a/src/zope/interface/tests/test_declarations.py b/src/zope/interface/tests/test_declarations.py
index 6c0f5bb..cd95f82 100644
--- a/src/zope/interface/tests/test_declarations.py
+++ b/src/zope/interface/tests/test_declarations.py
@@ -15,9 +15,10 @@
 
 $Id$
 """
+import doctest
 import unittest
+
 from zope.interface import *
-from zope.testing.doctest import DocTestSuite
 from zope.interface import Interface
 
 class I1(Interface): pass
@@ -423,8 +424,8 @@ def test_provided_by_with_slots():
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Test))
-    suite.addTest(DocTestSuite("zope.interface.declarations"))
-    suite.addTest(DocTestSuite())
+    suite.addTest(doctest.DocTestSuite("zope.interface.declarations"))
+    suite.addTest(doctest.DocTestSuite())
     
     return suite
 
diff --git a/src/zope/interface/tests/test_interface.py b/src/zope/interface/tests/test_interface.py
index 034e032..6cca70d 100644
--- a/src/zope/interface/tests/test_interface.py
+++ b/src/zope/interface/tests/test_interface.py
@@ -13,6 +13,7 @@
 ##############################################################################
 """Test Interface implementation
 """
+import doctest
 import unittest
 import sys
 
@@ -383,7 +384,6 @@ if sys.version_info >= (2, 4):
         """
 
 def test_suite():
-    from zope.testing import doctest
     suite = unittest.makeSuite(InterfaceTests)
     suite.addTest(doctest.DocTestSuite("zope.interface.interface"))
     if sys.version_info >= (2, 4):
diff --git a/src/zope/interface/tests/test_odd_declarations.py b/src/zope/interface/tests/test_odd_declarations.py
index 9f12fb3..03b7c38 100644
--- a/src/zope/interface/tests/test_odd_declarations.py
+++ b/src/zope/interface/tests/test_odd_declarations.py
@@ -18,7 +18,10 @@ classic ExtensionClass classes and instances.
 
 $Id$
 """
-import unittest, odd
+import doctest
+import odd
+import unittest
+
 from zope.interface import Interface, implements, implementsOnly
 from zope.interface import directlyProvides, providedBy, directlyProvidedBy
 from zope.interface import classImplements, classImplementsOnly, implementedBy
@@ -195,7 +198,6 @@ class Test(unittest.TestCase):
 
 
 def test_suite():
-    from zope.testing import doctest
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Test))
     suite.addTest(doctest.DocTestSuite(odd))
diff --git a/src/zope/interface/tests/test_verify.py b/src/zope/interface/tests/test_verify.py
index f06af1c..e43f726 100644
--- a/src/zope/interface/tests/test_verify.py
+++ b/src/zope/interface/tests/test_verify.py
@@ -15,14 +15,14 @@
 
 $Id$
 """
+import doctest
+import unittest
+
 from zope.interface import Interface, implements, classImplements, Attribute
 from zope.interface.verify import verifyClass, verifyObject
 from zope.interface.exceptions import DoesNotImplement, BrokenImplementation
 from zope.interface.exceptions import BrokenMethodImplementation
 
-import unittest
-from zope.testing import doctest
-
 class Test(unittest.TestCase):
 
     def testNotImplemented(self):