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

[Hanno Schlichting]

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

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

-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt	2010-04-30 22:06:03 UTC (rev 111773)
+++ zope.site/trunk/CHANGES.txt	2010-04-30 22:08:52 UTC (rev 111774)
@@ -5,9 +5,10 @@
 3.9.1 (unreleased)
 ------------------
 
+Removed use of 'zope.testing.doctest' in favor of stdlib's 'doctest.
+
 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_registration.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_registration.py	2010-04-30 22:06:03 UTC (rev 111773)
+++ zope.site/trunk/src/zope/site/tests/test_registration.py	2010-04-30 22:08:52 UTC (rev 111774)
@@ -17,12 +17,14 @@
 """
 __docformat__ = "reStructuredText"
 
+import doctest
+import os
+import unittest
+import warnings
+
 import ZODB.FileStorage
-import os
 import persistent
 import transaction
-import unittest
-import warnings
 import zope.component.globalregistry
 import zope.component.testing as placelesssetup
 import zope.container.contained
@@ -30,7 +32,6 @@
 from ZODB.DB import DB
 from ZODB.DemoStorage import DemoStorage
 from zope import interface
-from zope.testing import doctest
 
 
 # test class for testing data conversion

Modified: zope.site/trunk/src/zope/site/tests/test_site.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_site.py	2010-04-30 22:06:03 UTC (rev 111773)
+++ zope.site/trunk/src/zope/site/tests/test_site.py	2010-04-30 22:08:52 UTC (rev 111774)
@@ -16,11 +16,12 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
+
+import doctest
 import unittest
 
 import zope.interface
 import zope.interface.verify
-from zope.testing import doctest
 from zope.component.interfaces import ISite, IPossibleSite
 
 from zope.site import folder