[Python-checkins] bpo-44648: Fix error type in inspect.getsource() in interactive session (GH-27171) (GH-27495)

ambv webhook-mailer at python.org
Fri Jul 30 13:46:51 EDT 2021


https://github.com/python/cpython/commit/f468ede4a2b7ab5c72ae85ab04cb56904300cd23
commit: f468ede4a2b7ab5c72ae85ab04cb56904300cd23
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-07-30T19:46:42+02:00
summary:

bpo-44648: Fix error type in inspect.getsource() in interactive session (GH-27171) (GH-27495)

(cherry picked from commit 48a62559dfaf775e4f1cc56b19379c799e8e2587)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
M Lib/inspect.py
M Lib/test/test_inspect.py

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 750fd4515339b..7aedcf1a941b3 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -781,6 +781,8 @@ def getfile(object):
             module = sys.modules.get(object.__module__)
             if getattr(module, '__file__', None):
                 return module.__file__
+            if object.__module__ == '__main__':
+                raise OSError('source code not available')
         raise TypeError('{!r} is a built-in class'.format(object))
     if ismethod(object):
         object = object.__func__
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 38d161898fd08..b664c14020f35 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -585,6 +585,20 @@ def monkey(filename, module_globals=None):
     def test_getsource_on_code_object(self):
         self.assertSourceEqual(mod.eggs.__code__, 12, 18)
 
+class TestGetsourceInteractive(unittest.TestCase):
+    def tearDown(self):
+        mod.ParrotDroppings.__module__ = mod
+        sys.modules['__main__'] = self.main
+
+    def test_getclasses_interactive(self):
+        self.main = sys.modules['__main__']
+        class MockModule:
+            __file__ = None
+        sys.modules['__main__'] = MockModule
+        mod.ParrotDroppings.__module__ = '__main__'
+        with self.assertRaisesRegex(OSError, 'source code not available') as e:
+            inspect.getsource(mod.ParrotDroppings)
+
 class TestGettingSourceOfToplevelFrames(GetSourceBase):
     fodderModule = mod
 
@@ -4349,7 +4363,8 @@ def test_main():
         TestBoundArguments, TestSignaturePrivateHelpers,
         TestSignatureDefinitions, TestIsDataDescriptor,
         TestGetClosureVars, TestUnwrap, TestMain, TestReload,
-        TestGetCoroutineState, TestGettingSourceOfToplevelFrames
+        TestGetCoroutineState, TestGettingSourceOfToplevelFrames,
+        TestGetsourceInteractive,
     )
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst b/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
new file mode 100644
index 0000000000000..f7171c3c84c5e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
@@ -0,0 +1,3 @@
+Fixed wrong error being thrown by :func:`inspect.getsource` when examining a
+class in the interactive session. Instead of :exc:`TypeError`, it should be
+:exc:`OSError` with appropriate error message.



More information about the Python-checkins mailing list