[Checkins] SVN: zope.configuration/trunk/ Prefer the standard libraries doctest module over zope.testing.doctest.
Hanno Schlichting
hannosch at hannosch.eu
Fri Apr 30 13:36:06 EDT 2010
Log message for revision 111665:
Prefer the standard libraries doctest module over zope.testing.doctest.
Changed:
U zope.configuration/trunk/CHANGES.txt
U zope.configuration/trunk/src/zope/configuration/tests/test_conditions.py
U zope.configuration/trunk/src/zope/configuration/tests/test_config.py
U zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py
U zope.configuration/trunk/src/zope/configuration/tests/test_nested.py
U zope.configuration/trunk/src/zope/configuration/tests/test_simple.py
U zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py
-=-
Modified: zope.configuration/trunk/CHANGES.txt
===================================================================
--- zope.configuration/trunk/CHANGES.txt 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/CHANGES.txt 2010-04-30 17:36:06 UTC (rev 111665)
@@ -5,13 +5,13 @@
3.7.2 (unreleased)
------------------
-- ...
+- Prefer the standard libraries doctest module over zope.testing.doctest.
3.7.1 (2010-01-05)
------------------
-- Jython support: use __builtin__ module import rather than assuming
- __builtins__ is available
+- Jython support: use ``__builtin__`` module import rather than assuming
+ ``__builtins__`` is available.
- Jython support: deal with the fact that the Jython SAX parser
returns attribute sets that have an empty string indicating no
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_conditions.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_conditions.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_conditions.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -83,9 +83,9 @@
'''
__docformat__ = "reStructuredText"
+import doctest
import zope.interface
import zope.schema
-import zope.testing.doctest
class IRegister(zope.interface.Interface):
@@ -106,4 +106,4 @@
)
def test_suite():
- return zope.testing.doctest.DocTestSuite()
+ return doctest.DocTestSuite()
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_config.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_config.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_config.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -19,7 +19,7 @@
import sys
import unittest
import re
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
from zope.testing import renormalizing
from zope.configuration.config import metans, ConfigurationMachine
from zope.configuration import config
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_nested.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_nested.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_nested.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -185,7 +185,7 @@
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
from zope import interface, schema
from zope.configuration import config, xmlconfig, fields
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_simple.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_simple.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_simple.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -170,7 +170,7 @@
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
from zope import interface
from zope import schema
from zope.configuration import fields, xmlconfig
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py 2010-04-30 17:35:35 UTC (rev 111664)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py 2010-04-30 17:36:06 UTC (rev 111665)
@@ -18,7 +18,7 @@
import unittest
import os
import re
-from zope.testing.doctest import DocTestSuite, DocFileSuite
+from doctest import DocTestSuite, DocFileSuite
from zope.testing import renormalizing
from zope.configuration import xmlconfig, config
from zope.configuration.tests.samplepackage import foo
More information about the checkins
mailing list