[Checkins] SVN: zope.interface/trunk/ Fixed unit tests replacing zope.testing.doctestunit with doctest: it has been

[Fabio Tranchitella]

Log message for revision 106942:
  Fixed unit tests replacing zope.testing.doctestunit with doctest: it has been
  deprecated.
  

Changed:
  U   zope.interface/trunk/CHANGES.txt
  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_verify.py

-=-
Modified: zope.interface/trunk/CHANGES.txt
===================================================================
--- zope.interface/trunk/CHANGES.txt	2009-12-22 21:44:16 UTC (rev 106941)
+++ zope.interface/trunk/CHANGES.txt	2009-12-22 21:46:12 UTC (rev 106942)
@@ -5,7 +5,8 @@
 3.5.4 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Fixed unit tests replacing zope.testing.doctestunit with doctest: it has been
+  deprecated.
 
 
 3.5.3 (2009-12-08)

Modified: zope.interface/trunk/src/zope/interface/tests/test_adapter.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_adapter.py	2009-12-22 21:44:16 UTC (rev 106941)
+++ zope.interface/trunk/src/zope/interface/tests/test_adapter.py	2009-12-22 21:46:12 UTC (rev 106942)
@@ -402,9 +402,9 @@
 
 
 def test_suite():
-    from zope.testing import doctest, doctestunit
+    from zope.testing import doctest
     return unittest.TestSuite((
-        doctestunit.DocFileSuite('../adapter.txt', '../adapter.ru.txt',
+        doctest.DocFileSuite('../adapter.txt', '../adapter.ru.txt',
                                  '../human.txt', '../human.ru.txt',
                                  'foodforthought.txt',
                                  globs={'__name__': '__main__'}),

Modified: zope.interface/trunk/src/zope/interface/tests/test_declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_declarations.py	2009-12-22 21:44:16 UTC (rev 106941)
+++ zope.interface/trunk/src/zope/interface/tests/test_declarations.py	2009-12-22 21:46:12 UTC (rev 106942)
@@ -17,7 +17,7 @@
 """
 import unittest
 from zope.interface import *
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 from zope.interface import Interface
 
 class I1(Interface): pass

Modified: zope.interface/trunk/src/zope/interface/tests/test_verify.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_verify.py	2009-12-22 21:44:16 UTC (rev 106941)
+++ zope.interface/trunk/src/zope/interface/tests/test_verify.py	2009-12-22 21:46:12 UTC (rev 106942)
@@ -21,7 +21,6 @@
 from zope.interface.exceptions import BrokenMethodImplementation
 
 import unittest
-import zope.testing.doctestunit
 from zope.testing import doctest
 
 class Test(unittest.TestCase):
@@ -193,7 +192,7 @@
 def test_suite():
     loader=unittest.TestLoader()
     return unittest.TestSuite((
-        zope.testing.doctestunit.DocFileSuite(
+        doctest.DocFileSuite(
             '../verify.txt',
             optionflags=doctest.NORMALIZE_WHITESPACE),
         loader.loadTestsFromTestCase(Test),