diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-06-11 20:56:46 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-06-11 20:56:46 (GMT) |
commit | 703f7c4bf5fa98f9b8b11593d3fa37eb68eae896 (patch) | |
tree | a4fe76c58a8cc614a02aaaed497289fcfc345934 /Lib/inspect.py | |
parent | 3ae42726d4ba3a304d42f0c7df039de777a678bb (diff) | |
parent | 9620cc04634e720d1d016cce4bf02e0c27607e64 (diff) | |
download | cpython-703f7c4bf5fa98f9b8b11593d3fa37eb68eae896.zip cpython-703f7c4bf5fa98f9b8b11593d3fa37eb68eae896.tar.gz cpython-703f7c4bf5fa98f9b8b11593d3fa37eb68eae896.tar.bz2 |
merge 3.2 (#9284)
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r-- | Lib/inspect.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index f200a82..aa4c30f 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -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__) |