[Python-checkins] r72605 - in python/trunk: Lib/inspect.py Lib/test/test_inspect.py Misc/ACKS Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Wed May 13 19:14:11 2009
New Revision: 72605

Log:
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/trunk/Lib/inspect.py
   python/trunk/Lib/test/test_inspect.py
   python/trunk/Misc/ACKS
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/inspect.py
==============================================================================
--- python/trunk/Lib/inspect.py	(original)
+++ python/trunk/Lib/inspect.py	Wed May 13 19:14:11 2009
@@ -523,7 +523,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/trunk/Lib/test/test_inspect.py
==============================================================================
--- python/trunk/Lib/test/test_inspect.py	(original)
+++ python/trunk/Lib/test/test_inspect.py	Wed May 13 19:14:11 2009
@@ -9,6 +9,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,
@@ -329,6 +332,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/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS	(original)
+++ python/trunk/Misc/ACKS	Wed May 13 19:14:11 2009
@@ -171,6 +171,7 @@
 Toby Dickenson
 Mark Dickinson
 Jack Diederich
+Daniel Diniz
 Yves Dionne
 Daniel Dittmar
 Jaromir Dolecek
@@ -577,6 +578,7 @@
 Brian Quinlan
 Anders Qvist
 Burton Radons
+Brodie Rao
 Antti Rasinen
 Eric Raymond
 Edward K. Ream

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed May 13 19:14:11 2009
@@ -293,6 +293,9 @@
 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.
+
 - Issue #5977: distutils build_ext.get_outputs was not taking into account the
   inplace option. Initial patch by kxroberto.