From: Nikita Sobolev <mail@sobolevn.me>
Date: Sun, 5 May 2024 18:46:37 +0000 (+0300)
Subject: gh-117389: Fix `test_compileall.EncodingTest` (#117390)
X-Git-Tag: v3.13.0b1~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44f67916dafd3583f482e6d001766581a1a734fc;p=thirdparty%2FPython%2Fcpython.git

gh-117389: Fix `test_compileall.EncodingTest` (#117390)
---

diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 14c2af19e3eb..bf0fd051672d 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -502,19 +502,25 @@ class EncodingTest(unittest.TestCase):
         self.directory = tempfile.mkdtemp()
         self.source_path = os.path.join(self.directory, '_test.py')
         with open(self.source_path, 'w', encoding='utf-8') as file:
-            file.write('# -*- coding: utf-8 -*-\n')
-            file.write('print u"\u20ac"\n')
+            # Intentional syntax error: bytes can only contain
+            # ASCII literal characters.
+            file.write('b"\u20ac"')
 
     def tearDown(self):
         shutil.rmtree(self.directory)
 
     def test_error(self):
-        try:
-            orig_stdout = sys.stdout
-            sys.stdout = io.TextIOWrapper(io.BytesIO(),encoding='ascii')
-            compileall.compile_dir(self.directory)
-        finally:
-            sys.stdout = orig_stdout
+        buffer = io.TextIOWrapper(io.BytesIO(), encoding='ascii')
+        with contextlib.redirect_stdout(buffer):
+            compiled = compileall.compile_dir(self.directory)
+        self.assertFalse(compiled)  # should not be successful
+        buffer.seek(0)
+        res = buffer.read()
+        self.assertIn(
+            'SyntaxError: bytes can only contain ASCII literal characters',
+            res,
+        )
+        self.assertNotIn('UnicodeEncodeError', res)
 
 
 class CommandLineTestsBase: