[Python-checkins] cpython (2.7): allow "fake" filenames in findsource (closes #9284)

benjamin.peterson python-checkins at python.org
Sat Jun 11 22:56:15 CEST 2011


http://hg.python.org/cpython/rev/527c40add91d
changeset: 70798:527c40add91d
branch: 2.7
parent: 70785:35c5d20edb38
user: Benjamin Peterson <benjamin at python.org>
date: Sat Jun 11 15:53:11 2011 -0500
summary:
 allow "fake" filenames in findsource (closes #9284)
This allows findsource() to work in doctests.
A patch from Dirkjan Ochtman.
files:
 Lib/inspect.py | 8 ++++++--
 Lib/test/test_inspect.py | 17 +++++++++++++++++
 Misc/NEWS | 3 +++
 3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/Lib/inspect.py b/Lib/inspect.py
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -524,9 +524,13 @@
 or code object. The source code is returned as a list of all the lines
 in the file and the line number indexes a line in that list. An IOError
 is raised if the source code cannot be retrieved."""
- file = getsourcefile(object)
- if not file:
+
+ file = getfile(object)
+ sourcefile = getsourcefile(object)
+ if not sourcefile and file[0] + file[-1] != '<>':
 raise IOError('source code not available')
+ file = sourcefile if sourcefile else file
+
 module = getmodule(object, file)
 if module:
 lines = linecache.getlines(file, module.__dict__)
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -295,6 +295,23 @@
 del sys.modules[name]
 inspect.getmodule(compile('a=10','','single'))
 
+ def test_proceed_with_fake_filename(self):
+ '''doctest monkeypatches linecache to enable inspection'''
+ fn, source = '<test>', 'def x(): pass\n'
+ getlines = linecache.getlines
+ def monkey(filename, module_globals=None):
+ if filename == fn:
+ return source.splitlines(True)
+ else:
+ return getlines(filename, module_globals)
+ linecache.getlines = monkey
+ try:
+ ns = {}
+ exec compile(source, fn, 'single') in ns
+ inspect.getsource(ns["x"])
+ finally:
+ linecache.getlines = getlines
+
 class TestDecorators(GetSourceBase):
 fodderFile = mod2
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@
 Library
 -------
 
+- Issue #9284: Allow inspect.findsource() to find the source of doctest
+ functions.
+
 - Issue #10694: zipfile now ignores garbage at the end of a zipfile.
 
 - Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes
-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /