[Python-checkins] r72607 - in python/branches/py3k: Lib/inspect.py Lib/test/test_inspect.py Misc/ACKS Misc/NEWS

Wed May 13 19:33:03 CEST 2009

Author: r.david.murray
Date: Wed May 13 19:33:03 2009
New Revision: 72607
Log:
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 (2009年5月13日) | 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.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/inspect.py
 python/branches/py3k/Lib/test/test_inspect.py
 python/branches/py3k/Misc/ACKS
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/inspect.py
==============================================================================

--- python/branches/py3k/Lib/inspect.py	(original)
+++ python/branches/py3k/Lib/inspect.py	Wed May 13 19:33:03 2009
@@ -518,7 +518,9 @@
 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__)
Modified: python/branches/py3k/Lib/test/test_inspect.py
==============================================================================
--- python/branches/py3k/Lib/test/test_inspect.py	(original)
+++ python/branches/py3k/Lib/test/test_inspect.py	Wed May 13 19:33:03 2009
@@ -11,6 +11,9 @@
 from test import inspect_fodder as mod
 from test import inspect_fodder2 as mod2
 
+# C module for test_findsource_binary
+import time
+
 # Functions tested in this suite:
 # ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode,
 # isbuiltin, isroutine, isgenerator, isgeneratorfunction, getmembers,
@@ -336,6 +339,10 @@
 def test_method_in_dynamic_class(self):
 self.assertSourceEqual(mod2.method_in_dynamic_class, 95, 97)
 
+ def test_findsource_binary(self):
+ self.assertRaises(IOError, inspect.getsource, time)
+ self.assertRaises(IOError, inspect.findsource, time)
+
 # Helper for testing classify_class_attrs.
 def attrs_wo_objs(cls):
 return [t[:3] for t in inspect.classify_class_attrs(cls)]
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Wed May 13 19:33:03 2009
@@ -171,6 +171,7 @@
 Toby Dickenson
 Mark Dickinson
 Jack Diederich
+Daniel Diniz
 Humberto Diogenes
 Yves Dionne
 Daniel Dittmar
@@ -581,6 +582,7 @@
 Brian Quinlan
 Anders Qvist
 Burton Radons
+Brodie Rao
 Antti Rasinen
 Eric Raymond
 Edward K. Ream
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed May 13 19:33:03 2009
@@ -23,6 +23,10 @@
 Library
 -------
 
+- Issue #4050: inspect.findsource/getsource now raise an IOError if the 'source'
+ file is a binary. Patch by Brodie Rao, tests by Daniel Diniz. This fix
+ corrects a pydoc regression.
+
 - Issue 5955: aifc's close method did not close the file it wrapped,
 now it does. This also means getfp method now returns the real fp.
 
