From cfdd7d26a72e7ae523039e40c11001c2d7ef36ba Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:23:43 -0700 Subject: bpo-45406: make inspect.getmodule() return None when getabsfile() raises FileNotFoundError (GH-28824) (cherry picked from commit a459a81530de700b3d3faeb827b22ed1c9985812) Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com> --- Lib/inspect.py | 2 +- Lib/test/test_inspect.py | 9 +++++++++ .../NEWS.d/next/Library/2021-10-08-19-24-48.bpo-45406.Qh_Mz4.rst | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-10-08-19-24-48.bpo-45406.Qh_Mz4.rst diff --git a/Lib/inspect.py b/Lib/inspect.py index 531b891..6d43d8d 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -859,7 +859,7 @@ def getmodule(object, _filename=None): # Try the cache again with the absolute file name try: file = getabsfile(object, _filename) - except TypeError: + except (TypeError, FileNotFoundError): return None if file in modulesbyfile: return sys.modules.get(modulesbyfile[file]) diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 4164634..93ff2f8 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -493,6 +493,15 @@ class TestRetrievingSourceCode(GetSourceBase): # Check filename override self.assertEqual(inspect.getmodule(None, modfile), mod) + def test_getmodule_file_not_found(self): + # See bpo-45406 + def _getabsfile(obj, _filename): + raise FileNotFoundError('bad file') + with unittest.mock.patch('inspect.getabsfile', _getabsfile): + f = inspect.currentframe() + self.assertIsNone(inspect.getmodule(f)) + inspect.getouterframes(f) # smoke test + def test_getframeinfo_get_first_line(self): frame_info = inspect.getframeinfo(self.fodderModule.fr, 50) self.assertEqual(frame_info.code_context[0], "# line 1\n") diff --git a/Misc/NEWS.d/next/Library/2021-10-08-19-24-48.bpo-45406.Qh_Mz4.rst b/Misc/NEWS.d/next/Library/2021-10-08-19-24-48.bpo-45406.Qh_Mz4.rst new file mode 100644 index 0000000..2c3a816 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-08-19-24-48.bpo-45406.Qh_Mz4.rst @@ -0,0 +1 @@ +Make :func:`inspect.getmodule` catch ``FileNotFoundError`` raised by :'func:`inspect.getabsfile`, and return ``None`` to indicate that the module could not be determined. \ No newline at end of file -- cgit v0.12