summaryrefslogtreecommitdiffstats
path: root/Lib/doctest.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 09:15:16 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 09:15:16 (GMT)
commitc3c6fed6fe282ca2aedb9b15904bde63218dfc86 (patch)
tree2dd7ef87fe904ed056855d9c4e88871c580db807 /Lib/doctest.py
parent6b2964d6a484f066b28e79427dd4f1d8dbdb5de5 (diff)
downloadcpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.zip
cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.gz
cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.bz2
Merged revisions 74010,74034,74054 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r74010 | r.david.murray | 2009-07-15 16:16:54 +0200 (Mi, 15 Jul 2009) | 2 lines PEP-8-ify r73389. ................ r74034 | alexandre.vassalotti | 2009-07-17 07:35:59 +0200 (Fr, 17 Jul 2009) | 2 lines The output() function takes only one string argument. ................ r74054 | alexandre.vassalotti | 2009-07-17 10:31:44 +0200 (Fr, 17 Jul 2009) | 14 lines Merged revisions 74051-74052 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74051 | alexandre.vassalotti | 2009-07-17 03:54:23 -0400 (Fri, 17 Jul 2009) | 2 lines Initialize variables in PyCurses_getsyx() to avoid compiler warnings. ........ r74052 | alexandre.vassalotti | 2009-07-17 04:09:04 -0400 (Fri, 17 Jul 2009) | 3 lines Fix GCC warning about fprintf used without a string literal and without format arguments. ........ ................
Diffstat (limited to 'Lib/doctest.py')
-rw-r--r--Lib/doctest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 3d053d9..b95566f 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -821,7 +821,8 @@ class DocTestFinder:
# (see __patched_linecache_getlines).
file = inspect.getfile(obj)
if not file[0]+file[-2:] == '<]>': file = None
- if file is None: source_lines = None
+ if file is None:
+ source_lines = None
else:
if module is not None:
# Supply the module globals in case the module was