From: Tian Gao Date: Thu, 29 Feb 2024 23:24:09 +0000 (-0800) Subject: [3.12] gh-87115: Set `__main__.__spec__` to `None` in pdb (GH-116141) (#116154) X-Git-Tag: v3.12.3~174 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40e9295a581f2908f2cdf09b1726822379ea7bd0;p=thirdparty%2FPython%2Fcpython.git [3.12] gh-87115: Set `__main__.__spec__` to `None` in pdb (GH-116141) (#116154) * gh-87115: Set `__main__.__spec__` to `None` in pdb (#116141) (cherry picked from commit ccfc042bbf31e53c44b8aae444afd8365b798422) * [3.12] gh-87115: Set `__main__.__spec__` to `None` in pdb (GH-116141) (cherry picked from commit ccfc042bbf31e53c44b8aae444afd8365b798422) Co-authored-by: Tian Gao --- diff --git a/Lib/pdb.py b/Lib/pdb.py index a838a26b038d..494e640cda27 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -154,6 +154,7 @@ class _ScriptTarget(str): __name__='__main__', __file__=self, __builtins__=__builtins__, + __spec__=None, ) @property diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 51b844262ed1..0e1b1c9864f8 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -2013,6 +2013,18 @@ def bœr(): ('bœr', 1), ) + def test_spec(self): + # Test that __main__.__spec__ is set to None when running a script + script = """ + import __main__ + print(__main__.__spec__) + """ + + commands = "continue" + + stdout, _ = self.run_pdb_script(script, commands) + self.assertIn('None', stdout) + def test_issue7964(self): # open the file as binary so we can force \r\n newline with open(os_helper.TESTFN, 'wb') as f: diff --git a/Misc/NEWS.d/next/Library/2024-02-29-20-06-06.gh-issue-87115.FVMiOR.rst b/Misc/NEWS.d/next/Library/2024-02-29-20-06-06.gh-issue-87115.FVMiOR.rst new file mode 100644 index 000000000000..844340583cd4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-02-29-20-06-06.gh-issue-87115.FVMiOR.rst @@ -0,0 +1 @@ +Set ``__main__.__spec__`` to ``None`` when running a script with :mod:`pdb`