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

[Tres Seaver]

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

Changed:
  U   zope.site/trunk/CHANGES.txt
  U   zope.site/trunk/src/zope/site/tests/test_folder.py

-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt	2010-04-16 19:19:24 UTC (rev 110997)
+++ zope.site/trunk/CHANGES.txt	2010-04-16 19:28:30 UTC (rev 110998)
@@ -5,7 +5,9 @@
 3.9.1 (unreleased)
 ------------------
 
+Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
 
+
 3.9.0 (2009-12-29)
 ------------------
 

Modified: zope.site/trunk/src/zope/site/tests/test_folder.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_folder.py	2010-04-16 19:19:24 UTC (rev 110997)
+++ zope.site/trunk/src/zope/site/tests/test_folder.py	2010-04-16 19:28:30 UTC (rev 110998)
@@ -1,7 +1,6 @@
 from unittest import TestSuite, makeSuite
 
-from zope.testing.doctestunit import DocTestSuite
-from zope.testing import doctest
+import doctest
 
 from zope.site.folder import Folder
 from zope.site.testing import siteSetUp, siteTearDown
@@ -24,7 +23,7 @@
     flags = doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE
     return TestSuite((
             makeSuite(FolderTest),
-            DocTestSuite('zope.site.folder',
+            doctest.DocTestSuite('zope.site.folder',
                          setUp=setUp, tearDown=tearDown),
             doctest.DocFileSuite("folder.txt",
                              setUp=setUp, tearDown=tearDown,