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

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


http://hg.python.org/cpython/rev/6cc4579dca02
changeset:   70799:6cc4579dca02
branch:      3.2
parent:      70795:9bfaa723a194
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
@@ -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
@@ -22,6 +22,9 @@
 Library
 -------
 
+- Issue #9284: Allow inspect.findsource() to find the source of doctest
+  functions.
+
 - Issue #12009: Fixed regression in netrc file comment handling.
 
 - Issue #10694: zipfile now ignores garbage at the end of a zipfile.

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list