[Checkins] SVN: zope.browsermenu/trunk/ Removed use of 'zope.testing.doctestunit' in favor of stdlib's doctest.

[Tres Seaver]

Log message for revision 111004:
  Removed use of 'zope.testing.doctestunit' in favor of stdlib's doctest.
  

Changed:
  U   zope.browsermenu/trunk/CHANGES.txt
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_addMenuItem.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_fields.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menu.py

-=-
Modified: zope.browsermenu/trunk/CHANGES.txt
===================================================================
--- zope.browsermenu/trunk/CHANGES.txt	2010-04-16 20:03:32 UTC (rev 111003)
+++ zope.browsermenu/trunk/CHANGES.txt	2010-04-16 20:13:36 UTC (rev 111004)
@@ -5,7 +5,7 @@
 3.9.1 (unreleased)
 ==================
 
-- ...
+- Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
 
 
 3.9.0 (2009-08-27)

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_addMenuItem.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_addMenuItem.py	2010-04-16 20:03:32 UTC (rev 111003)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_addMenuItem.py	2010-04-16 20:13:36 UTC (rev 111004)
@@ -64,7 +64,7 @@
 """
 
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
 import re
 import pprint
 import cStringIO

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py	2010-04-16 20:03:32 UTC (rev 111003)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py	2010-04-16 20:13:36 UTC (rev 111004)
@@ -20,6 +20,7 @@
 import os
 import unittest
 from cStringIO import StringIO
+from doctest import DocTestSuite
 
 from zope import component
 from zope.interface import Interface, implements, directlyProvides, providedBy
@@ -34,7 +35,6 @@
 from zope.security.proxy import removeSecurityProxy, ProxyFactory
 from zope.security.permission import Permission
 from zope.security.interfaces import IPermission
-from zope.testing.doctest import DocTestSuite
 from zope.traversing.adapters import DefaultTraversable
 from zope.traversing.interfaces import ITraversable
 

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_fields.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_fields.py	2010-04-16 20:03:32 UTC (rev 111003)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_fields.py	2010-04-16 20:13:36 UTC (rev 111004)
@@ -16,7 +16,8 @@
 $Id$
 """
 import unittest
-from zope.testing import cleanup, doctest
+import doctest
+from zope.testing import cleanup
 
 def test_suite():
     return unittest.TestSuite((

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menu.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menu.py	2010-04-16 20:03:32 UTC (rev 111003)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menu.py	2010-04-16 20:13:36 UTC (rev 111004)
@@ -16,13 +16,15 @@
 $Id$
 """
 import unittest
-from zope.testing import doctest, cleanup, doctestunit
+import doctest
+import pprint
+from zope.testing import cleanup
 
 def test_suite():
     return unittest.TestSuite((
         doctest.DocFileSuite('../README.txt',
                              setUp=lambda test:cleanup.setUp(),
                              tearDown=lambda test:cleanup.tearDown(),
-                             globs={'pprint': doctestunit.pprint},
+                             globs={'pprint': pprint.pprint},
                              optionflags=doctest.NORMALIZE_WHITESPACE),
         ))