summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_doctest.py
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2008-12-14 11:50:48 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2008-12-14 11:50:48 (GMT)
commitf088e5e6cc0e7ad7991a910be13510ca33e91958 (patch)
treebc4281856af88400076b08b3e6d4431565017e3e /Lib/test/test_doctest.py
parent80a0c7f62366235059bd2e5892554fa75c7670ca (diff)
downloadcpython-f088e5e6cc0e7ad7991a910be13510ca33e91958.zip
cpython-f088e5e6cc0e7ad7991a910be13510ca33e91958.tar.gz
cpython-f088e5e6cc0e7ad7991a910be13510ca33e91958.tar.bz2
Merged revisions 67750-67751 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67750 | nick.coghlan | 2008-12-14 20:54:50 +1000 (Sun, 14 Dec 2008) | 1 line Fix several issues relating to access to source code inside zipfiles. Initial work by Alexander Belopolsky. See Misc/NEWS in this checkin for details. ........ r67751 | nick.coghlan | 2008-12-14 21:09:40 +1000 (Sun, 14 Dec 2008) | 1 line Add file that was missed from r67750 ........
Diffstat (limited to 'Lib/test/test_doctest.py')
-rw-r--r--Lib/test/test_doctest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index f07da75..9a128fb 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -6,6 +6,9 @@ from test import support
import doctest
import warnings
+# NOTE: There are some additional tests relating to interaction with
+# zipimport in the test_zipimport_support test module.
+
######################################################################
## Sample Objects (used by test cases)
######################################################################
@@ -369,7 +372,7 @@ We'll simulate a __file__ attr that ends in pyc:
>>> tests = finder.find(sample_func)
>>> print(tests) # doctest: +ELLIPSIS
- [<DocTest sample_func from ...:13 (1 example)>]
+ [<DocTest sample_func from ...:16 (1 example)>]
The exact name depends on how test_doctest was invoked, so allow for
leading path components.