[Checkins] SVN: zope.browserpage/trunk/ Prefer the standard libraries doctest module to the one from zope.testing.

[Hanno Schlichting]

Log message for revision 111689:
  Prefer the standard libraries doctest module to the one from zope.testing.
  

Changed:
  U   zope.browserpage/trunk/CHANGES.txt
  U   zope.browserpage/trunk/src/zope/browserpage/tests/test_namedtemplate.py
  U   zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py

-=-
Modified: zope.browserpage/trunk/CHANGES.txt
===================================================================
--- zope.browserpage/trunk/CHANGES.txt	2010-04-30 19:53:41 UTC (rev 111688)
+++ zope.browserpage/trunk/CHANGES.txt	2010-04-30 19:55:22 UTC (rev 111689)
@@ -5,9 +5,8 @@
 3.12.1 (unreleased)
 ===================
 
-- Nothing changed yet.
+- Prefer the standard libraries doctest module to the one from zope.testing.
 
-
 3.12.0 (2010-04-26)
 ===================
 

Modified: zope.browserpage/trunk/src/zope/browserpage/tests/test_namedtemplate.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/tests/test_namedtemplate.py	2010-04-30 19:53:41 UTC (rev 111688)
+++ zope.browserpage/trunk/src/zope/browserpage/tests/test_namedtemplate.py	2010-04-30 19:55:22 UTC (rev 111689)
@@ -30,7 +30,7 @@
 
 
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     return doctest.DocFileSuite(
         os.path.join(os.pardir, 'namedtemplate.txt'),
         setUp=pageSetUp, tearDown=zope.component.testing.tearDown,

Modified: zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2010-04-30 19:53:41 UTC (rev 111688)
+++ zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2010-04-30 19:55:22 UTC (rev 111689)
@@ -19,6 +19,7 @@
 import sys
 import os
 import unittest
+from doctest import DocTestSuite
 from cStringIO import StringIO
 
 from zope import component
@@ -35,7 +36,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.testing import cleanup
 from zope.traversing.adapters import DefaultTraversable
 from zope.traversing.interfaces import ITraversable