[Checkins] SVN: zope.app.testing/trunk/ Switch doctests to use the stdlib ``doctest`` module.
Tres Seaver
tseaver at palladion.com
Sat Apr 10 19:58:29 EDT 2010
Log message for revision 110723:
Switch doctests to use the stdlib ``doctest`` module.
o Disuse than the deprecated ``zope.testing.doctest`` variant.
Remove a duplicated import.
Changed:
U zope.app.testing/trunk/CHANGES.txt
U zope.app.testing/trunk/src/zope/app/testing/functional.py
U zope.app.testing/trunk/src/zope/app/testing/tests.py
-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt 2010-04-10 23:58:28 UTC (rev 110722)
+++ zope.app.testing/trunk/CHANGES.txt 2010-04-10 23:58:29 UTC (rev 110723)
@@ -5,7 +5,8 @@
3.7.5 (unreleased)
------------------
-- Nothing changed yet.
+- Switch doctests to use the stdlib ``doctest`` module, rather than the
+ deprecated ``zope.testing.doctest`` variant.
3.7.4 (2010-01-08)
Modified: zope.app.testing/trunk/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/functional.py 2010-04-10 23:58:28 UTC (rev 110722)
+++ zope.app.testing/trunk/src/zope/app/testing/functional.py 2010-04-10 23:58:29 UTC (rev 110723)
@@ -18,6 +18,7 @@
$Id$
"""
import copy
+import doctest
import logging
import os.path
import re
@@ -39,7 +40,6 @@
from zope.publisher.publish import publish
from zope.publisher.skinnable import setDefaultSkin
from zope.security.interfaces import Forbidden, Unauthorized
-from zope.testing import doctest
import zope.app.appsetup.product
import zope.app.testing.setup
@@ -47,7 +47,6 @@
from zope.app.debug import Debugger
from zope.app.publication.http import HTTPPublication
from zope.app.publication.zopepublication import ZopePublication
-from zope.app.publication.http import HTTPPublication
from zope.app.publication.httpfactory import chooseClasses
from zope.component.hooks import setSite, getSite
Modified: zope.app.testing/trunk/src/zope/app/testing/tests.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/tests.py 2010-04-10 23:58:28 UTC (rev 110722)
+++ zope.app.testing/trunk/src/zope/app/testing/tests.py 2010-04-10 23:58:29 UTC (rev 110723)
@@ -15,12 +15,12 @@
$Id$
"""
+from doctest import DocTestSuite
import os
import re
import unittest
import StringIO
-from zope.testing.doctestunit import DocTestSuite
from zope.testing.renormalizing import RENormalizing
from zope.component import getAllUtilitiesRegisteredFor
from ZODB.interfaces import IDatabase
More information about the checkins
mailing list