[Checkins] SVN: zope.interface/trunk/ Use the standard Python doctest module instead of zope.testing.doctest, which

[Fabio Tranchitella]

Log message for revision 107000:
  Use the standard Python doctest module instead of zope.testing.doctest, which
  has been deprecated.
  

Changed:
  U   zope.interface/trunk/CHANGES.txt
  U   zope.interface/trunk/setup.py
  U   zope.interface/trunk/src/zope/interface/common/tests/test_import_interfaces.py
  U   zope.interface/trunk/src/zope/interface/tests/test_adapter.py
  U   zope.interface/trunk/src/zope/interface/tests/test_declarations.py
  U   zope.interface/trunk/src/zope/interface/tests/test_interface.py
  U   zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py
  U   zope.interface/trunk/src/zope/interface/tests/test_verify.py

-=-
Modified: zope.interface/trunk/CHANGES.txt
===================================================================
--- zope.interface/trunk/CHANGES.txt	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/CHANGES.txt	2009-12-23 12:38:19 UTC (rev 107000)
@@ -2,11 +2,11 @@
 *******
 
 ==================
-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)

Modified: zope.interface/trunk/setup.py
===================================================================
--- zope.interface/trunk/setup.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/setup.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -120,7 +120,7 @@
 
 
 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',

Modified: zope.interface/trunk/src/zope/interface/common/tests/test_import_interfaces.py
===================================================================
--- zope.interface/trunk/src/zope/interface/common/tests/test_import_interfaces.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/common/tests/test_import_interfaces.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -11,8 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+import doctest
 import unittest
-from zope.testing import doctest
 
 def test_interface_import():
     """

Modified: zope.interface/trunk/src/zope/interface/tests/test_adapter.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_adapter.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/tests/test_adapter.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -15,6 +15,7 @@
 
 $Id$
 """
+import doctest
 import unittest
 import zope.interface
 from zope.interface.adapter import AdapterRegistry
@@ -402,7 +403,6 @@
 
 
 def test_suite():
-    from zope.testing import doctest
     return unittest.TestSuite((
         doctest.DocFileSuite('../adapter.txt', '../adapter.ru.txt',
                                  '../human.txt', '../human.ru.txt',

Modified: zope.interface/trunk/src/zope/interface/tests/test_declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_declarations.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/tests/test_declarations.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -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_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
 

Modified: zope.interface/trunk/src/zope/interface/tests/test_interface.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_interface.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/tests/test_interface.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -13,6 +13,7 @@
 ##############################################################################
 """Test Interface implementation
 """
+import doctest
 import unittest
 import sys
 
@@ -383,7 +384,6 @@
         """
 
 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):

Modified: zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -18,7 +18,10 @@
 
 $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 @@
 
 
 def test_suite():
-    from zope.testing import doctest
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Test))
     suite.addTest(doctest.DocTestSuite(odd))

Modified: zope.interface/trunk/src/zope/interface/tests/test_verify.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_verify.py	2009-12-23 09:40:05 UTC (rev 106999)
+++ zope.interface/trunk/src/zope/interface/tests/test_verify.py	2009-12-23 12:38:19 UTC (rev 107000)
@@ -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):