[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#9284)
benjamin.peterson
python-checkins at python.org
Sat Jun 11 22:56:17 CEST 2011
http://hg.python.org/cpython/rev/f05affb0bb2a
changeset: 70800:f05affb0bb2a
parent: 70797:7b02717d5345
parent: 70799:6cc4579dca02
user: Benjamin Peterson <benjamin at python.org>
date: Sat Jun 11 15:56:46 2011 -0500
summary:
merge 3.2 (#9284)
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
@@ -518,9 +518,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
@@ -298,6 +298,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'), ns)
+ inspect.getsource(ns["x"])
+ finally:
+ linecache.getlines = getlines
+
class TestDecorators(GetSourceBase):
fodderModule = mod2
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -190,6 +190,9 @@
- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files.
Original patch by Erik Bray.
+- Issue #9284: Allow inspect.findsource() to find the source of doctest
+ functions.
+
- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a
compatibility helper for the distutils-packaging transition. Original patch
by Erik Bray.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list