[Checkins] SVN: z3c.schema/trunk/ - Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest[unit]``.
Michael Howitz
mh at gocept.com
Mon Oct 18 04:00:36 EDT 2010
Log message for revision 117620:
- Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest[unit]``.
Changed:
U z3c.schema/trunk/CHANGES.txt
U z3c.schema/trunk/src/z3c/schema/baseurl/tests.py
U z3c.schema/trunk/src/z3c/schema/dateselect/tests.py
U z3c.schema/trunk/src/z3c/schema/email/tests.py
U z3c.schema/trunk/src/z3c/schema/hostname/tests.py
U z3c.schema/trunk/src/z3c/schema/ip/tests.py
U z3c.schema/trunk/src/z3c/schema/optchoice/tests.py
U z3c.schema/trunk/src/z3c/schema/payments/tests.py
U z3c.schema/trunk/src/z3c/schema/regex/tests.py
-=-
Modified: z3c.schema/trunk/CHANGES.txt
===================================================================
--- z3c.schema/trunk/CHANGES.txt 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/CHANGES.txt 2010-10-18 08:00:36 UTC (rev 117620)
@@ -8,7 +8,10 @@
- Updated tests to run with `zope.schema` >= 3.6, thus requiring at least
this version.
+- Using Python's ``doctest`` module instead of depreacted
+ ``zope.testing.doctest[unit]``.
+
0.6.1 (2010-10-18)
------------------
Modified: z3c.schema/trunk/src/z3c/schema/baseurl/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/baseurl/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/baseurl/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,16 +11,11 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id:$
-"""
-__docformat__ = "reStructuredText"
-import unittest
from zope.schema.interfaces import RequiredMissing
from zope.schema.tests.test_field import FieldTestBase
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import doctest
+import unittest
from z3c.schema.baseurl import BaseURL
from z3c.schema.baseurl import InvalidBaseURL
@@ -57,10 +52,7 @@
def test_suite():
return unittest.TestSuite((
- DocFileSuite('README.txt',
+ doctest.DocFileSuite('README.txt',
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
unittest.makeSuite(BaseURLTest),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: z3c.schema/trunk/src/z3c/schema/dateselect/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/dateselect/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/dateselect/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,22 +11,11 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
-
+import doctest
import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.schema/trunk/src/z3c/schema/email/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/email/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/email/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,22 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
+import doctest
-import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.schema/trunk/src/z3c/schema/hostname/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/hostname/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/hostname/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,16 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id:$
-"""
-__docformat__ = "reStructuredText"
-
-import unittest
from zope.schema.interfaces import RequiredMissing
from zope.schema.tests.test_field import FieldTestBase
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import doctest
+import unittest
from z3c.schema.hostname import HostName
from z3c.schema.hostname import InvalidHostName
@@ -59,10 +53,7 @@
def test_suite():
return unittest.TestSuite((
- DocFileSuite('README.txt',
+ doctest.DocFileSuite('README.txt',
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
unittest.makeSuite(HostNameTest),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: z3c.schema/trunk/src/z3c/schema/ip/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/ip/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/ip/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,22 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
+import doctest
-import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.schema/trunk/src/z3c/schema/optchoice/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/optchoice/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/optchoice/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,21 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id:$
-"""
-__docformat__ = "reStructuredText"
+import doctest
-import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.schema/trunk/src/z3c/schema/payments/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/payments/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/payments/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -11,22 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id:$
-"""
-__docformat__ = "reStructuredText"
+import doctest
-import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.schema/trunk/src/z3c/schema/regex/tests.py
===================================================================
--- z3c.schema/trunk/src/z3c/schema/regex/tests.py 2010-10-18 07:51:59 UTC (rev 117619)
+++ z3c.schema/trunk/src/z3c/schema/regex/tests.py 2010-10-18 08:00:36 UTC (rev 117620)
@@ -9,11 +9,10 @@
"""
__docformat__ = 'restructuredtext'
-import unittest
from zope.schema.interfaces import RequiredMissing
from zope.schema.tests.test_field import FieldTestBase
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import doctest
+import unittest
from z3c.schema.hostname import HostName
from z3c.schema.hostname import InvalidHostName
@@ -52,10 +51,7 @@
def test_suite():
return unittest.TestSuite((
- DocFileSuite('README.txt',
+ doctest.DocFileSuite('README.txt',
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
unittest.makeSuite(HostNameTest),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list