[Zope3-checkins] SVN: zope.testing/branches/regebro-400/s A bit of cleanup.
Lennart Regebro
regebro at gmail.com
Wed Apr 28 02:27:07 EDT 2010
Log message for revision 111518:
A bit of cleanup.
Changed:
U zope.testing/branches/regebro-400/setup.py
D zope.testing/branches/regebro-400/src/zope/testing/doctest.txt
-=-
Modified: zope.testing/branches/regebro-400/setup.py
===================================================================
--- zope.testing/branches/regebro-400/setup.py 2010-04-28 06:24:28 UTC (rev 111517)
+++ zope.testing/branches/regebro-400/setup.py 2010-04-28 06:27:06 UTC (rev 111518)
@@ -27,8 +27,7 @@
if sys.version > '3':
extras = dict(
use_2to3 = True,
- convert_2to3_doctests = ['src/zope/testing/doctest.txt',
- 'src/zope/testing/formparser.txt',
+ convert_2to3_doctests = ['src/zope/testing/formparser.txt',
'src/zope/testing/module.txt',
'src/zope/testing/setupstack.txt',
],
@@ -79,7 +78,6 @@
packages=["zope",
"zope.testing",
- "zope.testing.doctest",
"zope.testing.renormalizing"],
package_dir = {'': 'src'},
namespace_packages=['zope',],
Deleted: zope.testing/branches/regebro-400/src/zope/testing/doctest.txt
===================================================================
--- zope.testing/branches/regebro-400/src/zope/testing/doctest.txt 2010-04-28 06:24:28 UTC (rev 111517)
+++ zope.testing/branches/regebro-400/src/zope/testing/doctest.txt 2010-04-28 06:27:06 UTC (rev 111518)
@@ -1,34 +0,0 @@
-========================
-Additional doctest Tests
-========================
-
-Most `doctest` module tests are located within the module. This file only
-tests a few additional features not covered by the module tests, so that the
-changes to the `doctest` module -- which is forked from the Python standard
-library -- are minimized.
-
-Working with Carriage Returns
------------------------------
-
-Due to the way releases are made on different platforms, we sometimes test
-files on a *nix system with Windows file endings. Unfortunately, that leaves
-some of the test files broken:
-
- >>> import tempfile
- >>> fn = tempfile.mktemp()
- >>> foo = open(fn, 'w').write('Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n')
-
-Let's now run it as a doctest:
-
- >>> from zope.testing import doctest
- >>> a, b = doctest.testfile(fn, False) # doctest 2.6 and later uses a named tuple here.
- >>> a, b
- (0, 1)
-
-It worked. Let's also try the test file suite:
-
- >>> import unittest
- >>> result = unittest.TestResult()
- >>> doctest.DocFileSuite(fn, module_relative=False).run(result) #doctest: +ELLIPSIS
- <...TestResult run=1 errors=0 failures=0>
-
More information about the Zope3-Checkins
mailing list