]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-87115: Set `__main__.__spec__` to `None` in pdb (GH-116141) (#116154)
authorTian Gao <gaogaotiantian@hotmail.com>
Thu, 29 Feb 2024 23:24:09 +0000 (15:24 -0800)
committerGitHub <noreply@github.com>
Thu, 29 Feb 2024 23:24:09 +0000 (23:24 +0000)
* 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 <gaogaotiantian@hotmail.com>
Lib/pdb.py
Lib/test/test_pdb.py
Misc/NEWS.d/next/Library/2024-02-29-20-06-06.gh-issue-87115.FVMiOR.rst [new file with mode: 0644]

index a838a26b038df61ea38d26a9b05759e8b400756c..494e640cda27571424c7bd0bfa79e69945b9cada 100755 (executable)
@@ -154,6 +154,7 @@ class _ScriptTarget(str):
             __name__='__main__',
             __file__=self,
             __builtins__=__builtins__,
+            __spec__=None,
         )
 
     @property
index 51b844262ed1e8fa239bfa29745d4bc1ee1758c0..0e1b1c9864f8c1b28fc820251d0ccd129e6397a1 100644 (file)
@@ -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 (file)
index 0000000..8443405
--- /dev/null
@@ -0,0 +1 @@
+Set ``__main__.__spec__`` to ``None`` when running a script with :mod:`pdb`