[Checkins] SVN: zope.app.testing/branches/3.4/ Use doctest instead of deprecated zope.testing.doctest.

[Marius Gedminas]

Log message for revision 110210:
  Use doctest instead of deprecated zope.testing.doctest.
  
  

Changed:
  U   zope.app.testing/branches/3.4/CHANGES.txt
  U   zope.app.testing/branches/3.4/src/zope/app/testing/functional.py
  U   zope.app.testing/branches/3.4/src/zope/app/testing/tests.py

-=-
Modified: zope.app.testing/branches/3.4/CHANGES.txt
===================================================================
--- zope.app.testing/branches/3.4/CHANGES.txt	2010-03-26 17:00:22 UTC (rev 110209)
+++ zope.app.testing/branches/3.4/CHANGES.txt	2010-03-26 17:01:02 UTC (rev 110210)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.4.5 (unreleased)
+------------------
+
+- Use doctest instead of deprecated zope.testing.doctest.
+
 3.4.4 (2008-08-21)
 ------------------
 

Modified: zope.app.testing/branches/3.4/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/branches/3.4/src/zope/app/testing/functional.py	2010-03-26 17:00:22 UTC (rev 110209)
+++ zope.app.testing/branches/3.4/src/zope/app/testing/functional.py	2010-03-26 17:01:02 UTC (rev 110210)
@@ -24,6 +24,7 @@
 import sys
 import traceback
 import unittest
+import doctest
 from StringIO import StringIO
 from Cookie import SimpleCookie
 from transaction import abort, commit
@@ -36,7 +37,6 @@
 from zope.publisher.http import HTTPRequest
 from zope.publisher.publish import publish
 from zope.security.interfaces import Forbidden, Unauthorized
-from zope.testing import doctest
 
 import zope.app.testing.setup
 from zope.app.appsetup.appsetup import multi_database

Modified: zope.app.testing/branches/3.4/src/zope/app/testing/tests.py
===================================================================
--- zope.app.testing/branches/3.4/src/zope/app/testing/tests.py	2010-03-26 17:00:22 UTC (rev 110209)
+++ zope.app.testing/branches/3.4/src/zope/app/testing/tests.py	2010-03-26 17:01:02 UTC (rev 110210)
@@ -19,8 +19,8 @@
 import re
 import unittest
 import StringIO
+from doctest import DocTestSuite
 
-from zope.testing.doctestunit import DocTestSuite
 from zope.testing.renormalizing import RENormalizing
 from zope.component import getAllUtilitiesRegisteredFor
 from ZODB.interfaces import IDatabase