[Checkins] SVN: zope.interface/branches/regebro-python3/src/zope/interface/ zope.interface doesn't rely on the zope.testing doctest features, so to

[Lennart Regebro]

Log message for revision 98609:
  zope.interface doesn't rely on the zope.testing doctest features, so to 
  get rid of the zope.testing -> zope.interfaces -> zope.testing circular 
  dependency I moved zope.interfaces to use the stdlib doctest.
  
  This means we don't get post-mortem debugging, but we can live with that 
  at the moment, at least until zope.testing also gets ported to Python3.
  

Changed:
  U   zope.interface/branches/regebro-python3/src/zope/interface/common/tests/test_import_interfaces.py
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/foodforthought.txt
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/test_adapter.py
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/test_declarations.py
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/test_interface.py
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/test_odd_declarations.py
  U   zope.interface/branches/regebro-python3/src/zope/interface/tests/test_verify.py

-=-
Modified: zope.interface/branches/regebro-python3/src/zope/interface/common/tests/test_import_interfaces.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/common/tests/test_import_interfaces.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/common/tests/test_import_interfaces.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 import unittest
-from zope.testing import doctest
+import doctest
 
 def test_interface_import():
     """

Modified: zope.interface/branches/regebro-python3/src/zope/interface/tests/foodforthought.txt
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/foodforthought.txt	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/foodforthought.txt	2009-03-30 18:10:04 UTC (rev 98609)
@@ -51,7 +51,7 @@
     >>> meals = list(registry.subscriptions([IChicken], IRecipe))
     >>> meals.sort()
     >>> meals
-    ['kfc', 'noodles', 'sausages']
+    ['kfdc', 'noodles', 'sausages']
 
 And the answer for poultry hasn't changed::
 

Modified: zope.interface/branches/regebro-python3/src/zope/interface/tests/test_adapter.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/test_adapter.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/test_adapter.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -345,9 +345,9 @@
     """
 
 def test_suite():
-    from zope.testing import doctest, doctestunit
+    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/branches/regebro-python3/src/zope/interface/tests/test_declarations.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/test_declarations.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/test_declarations.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -17,7 +17,7 @@
 """
 import unittest
 from zope.interface import *
-from zope.testing.doctestunit import DocTestSuite
+from doctest import DocTestSuite
 from zope.interface import Interface
 
 class I1(Interface): pass

Modified: zope.interface/branches/regebro-python3/src/zope/interface/tests/test_interface.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/test_interface.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/test_interface.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -17,7 +17,7 @@
 """
 import sys
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from doctest import DocTestSuite
 from zope.interface.tests.unitfixtures import *  # hehehe
 from zope.interface.exceptions import BrokenImplementation, Invalid
 from zope.interface import implementedBy, providedBy
@@ -328,7 +328,7 @@
 """
 
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     suite = unittest.makeSuite(InterfaceTests)
     suite.addTest(doctest.DocTestSuite("zope.interface.interface"))
     if sys.version_info >= (2, 4):

Modified: zope.interface/branches/regebro-python3/src/zope/interface/tests/test_odd_declarations.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/test_odd_declarations.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/test_odd_declarations.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -195,7 +195,7 @@
 
 
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Test))
     suite.addTest(doctest.DocTestSuite(odd))

Modified: zope.interface/branches/regebro-python3/src/zope/interface/tests/test_verify.py
===================================================================
--- zope.interface/branches/regebro-python3/src/zope/interface/tests/test_verify.py	2009-03-30 18:04:16 UTC (rev 98608)
+++ zope.interface/branches/regebro-python3/src/zope/interface/tests/test_verify.py	2009-03-30 18:10:04 UTC (rev 98609)
@@ -21,8 +21,7 @@
 from zope.interface.exceptions import BrokenMethodImplementation
 
 import unittest
-import zope.testing.doctestunit
-from zope.testing import doctest
+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),