summaryrefslogtreecommitdiffstats
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-13 17:33:03 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-13 17:33:03 (GMT)
commit74b8924eaf5af4529d676b052347a3a1937c8796 (patch)
tree32333579a256472bc212411748ffdb42d179bc5e /Lib/inspect.py
parent14b7efa21532ba2585dd9910d9f2cf28d456e72d (diff)
downloadcpython-74b8924eaf5af4529d676b052347a3a1937c8796.zip
cpython-74b8924eaf5af4529d676b052347a3a1937c8796.tar.gz
cpython-74b8924eaf5af4529d676b052347a3a1937c8796.tar.bz2
This fix makes, eg, 'pydoc time' work again.
Merged revisions 72605 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72605 | r.david.murray | 2009-05-13 13:14:11 -0400 (Wed, 13 May 2009) | 3 lines Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source' file is a binary. Patch by Brodie Rao, test by Daniel Diniz. ........
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index a976c8b..c316906 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -518,7 +518,9 @@ 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) or getfile(object)
+ file = getsourcefile(object)
+ if not file:
+ raise IOError('source code not available')
module = getmodule(object, file)
if module:
lines = linecache.getlines(file, module.__dict__)