summaryrefslogtreecommitdiff
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2014-12-08 16:05:34 -0500
committerYury Selivanov <yselivanov@sprymix.com>2014-12-08 16:05:34 -0500
commitef1e7502256cfd550fe264a9832e3fc517cbcb42 (patch)
tree84abe5524a7944761d2b9c07fd39110f28de5008 /Lib/inspect.py
parentb532df62b95920c380190f4a468fe15ad0c7d39c (diff)
downloadcpython-git-ef1e7502256cfd550fe264a9832e3fc517cbcb42.tar.gz
inspect: Fix getsource() to load updated source of reloaded module
Issue #1218234. Initial patch by Berker Peksag.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 83044b49c9..b789d66b5b 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -653,11 +653,17 @@ def findsource(object):
in the file and the line number indexes a line in that list. An OSError
is raised if the source code cannot be retrieved."""
- file = getfile(object)
- sourcefile = getsourcefile(object)
- if not sourcefile and file[:1] + file[-1:] != '<>':
- raise OSError('source code not available')
- file = sourcefile if sourcefile else file
+ file = getsourcefile(object)
+ if file:
+ # Invalidate cache if needed.
+ linecache.checkcache(file)
+ else:
+ file = getfile(object)
+ # Allow filenames in form of "<something>" to pass through.
+ # `doctest` monkeypatches `linecache` module to enable
+ # inspection, so let `linecache.getlines` to be called.
+ if not (file.startswith('<') and file.endswith('>')):
+ raise OSError('source code not available')
module = getmodule(object, file)
if module: