merge 3.2 (#9284)
This commit is contained in:
commit
703f7c4bf5
|
@ -518,9 +518,13 @@ def findsource(object):
|
|||
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__)
|
||||
|
|
|
@ -298,6 +298,23 @@ class TestRetrievingSourceCode(GetSourceBase):
|
|||
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
|
||||
|
||||
|
|
|
@ -190,6 +190,9 @@ Library
|
|||
- 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.
|
||||
|
|
Loading…
Reference in New Issue