]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] gh-103578: Fix pdb reading code with non-utf8 encoding (GH-103581) (#103867)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 26 Apr 2023 05:28:29 +0000 (22:28 -0700)
committerGitHub <noreply@github.com>
Wed, 26 Apr 2023 05:28:29 +0000 (05:28 +0000)
`pdb` should use `io.open_code` to open code to avoid encoding issue.
(cherry picked from commit 31acfd78a0810f84898d36a8289e407d3754b823)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
Lib/pdb.py
Lib/test/test_pdb.py
Misc/NEWS.d/next/Library/2023-04-16-18-29-04.gh-issue-103578.fly1wc.rst [new file with mode: 0644]

index 57d070a87e8105bddd0a5d0d5169f75a6e866d0d..f9c5bee4c06c277b522aa0c71a0b608fd0460881 100755 (executable)
@@ -154,7 +154,7 @@ class _ScriptTarget(str):
 
     @property
     def code(self):
-        with io.open(self) as fp:
+        with io.open_code(self) as fp:
             return f"exec(compile({fp.read()!r}, {self!r}, 'exec'))"
 
 
index 1a0fbf405bffe9af79461d8998ed87f0e36b6d17..9328ccaf3bcee6bdc2a53b134ccf186a0e70c401 100644 (file)
@@ -2348,6 +2348,12 @@ def bœr():
         # verify that pdb found the source of the "frozen" function
         self.assertIn('x = "Sentinel string for gh-93696"', stdout, "Sentinel statement not found")
 
+    def test_non_utf8_encoding(self):
+        script_dir = os.path.join(os.path.dirname(__file__), 'encoded_modules')
+        for filename in os.listdir(script_dir):
+            if filename.endswith(".py"):
+                self._run_pdb([os.path.join(script_dir, filename)], 'q')
+
 class ChecklineTests(unittest.TestCase):
     def setUp(self):
         linecache.clearcache()  # Pdb.checkline() uses linecache.getline()
diff --git a/Misc/NEWS.d/next/Library/2023-04-16-18-29-04.gh-issue-103578.fly1wc.rst b/Misc/NEWS.d/next/Library/2023-04-16-18-29-04.gh-issue-103578.fly1wc.rst
new file mode 100644 (file)
index 0000000..69986c2
--- /dev/null
@@ -0,0 +1 @@
+Fixed a bug where :mod:`pdb` crashes when reading source file with different encoding by replacing :func:`io.open` with :func:`io.open_code`. The new method would also call into the hook set by :func:`PyFile_SetOpenCodeHook`.