Merge branch 'main' into utf-8-mode

# Conflicts: # Lib/test/test_cmd_line.py
python · AA-Turner · May 8, 2025 · May 10, 2025 · May 10, 2025 · May 10, 2025
commit b56e01b643fe6bc0cf18d837618af6397cadbe6d
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
@@ -977,19 +977,25 @@ def test_python_legacy_windows_fs_encoding(self):

    @unittest.skipUnless(support.MS_WINDOWS, 'Test only applicable on Windows')
    def test_python_legacy_windows_stdio(self):
-        def get_stderr_class(legacy_windows_stdio):
-            code = 'import sys; print(type(sys.stderr.buffer.raw))'
-            env = {'PYTHONLEGACYWINDOWSSTDIO': str(int(legacy_windows_stdio))}
-            # use stderr=None as legacy_windows_stdio doesn't affect pipes
-            p = spawn_python('-c', code, env=env, stderr=None)
-            out = kill_python(p).strip().decode('ascii', 'ignore')
-            return out.removeprefix("<class '").removesuffix("'>")
-
-        out = get_stderr_class(legacy_windows_stdio=True)
-        self.assertEqual('_io.FileIO', out)
-
-        out = get_stderr_class(legacy_windows_stdio=False)
-        self.assertEqual('_io._WindowsConsoleIO', out)
+        # Test that _WindowsConsoleIO is used when PYTHONLEGACYWINDOWSSTDIO
+        # is not set.
+        # We cannot use PIPE becase it prevents creating new console.
+        # So we use exit code.
+        code = "import sys; sys.exit(type(sys.stdout.buffer.raw).__name__ != '_WindowsConsoleIO')"
+        env = os.environ.copy()
+        env["PYTHONLEGACYWINDOWSSTDIO"] = ""
+        p = subprocess.run([sys.executable, "-c", code],
+                           creationflags=subprocess.CREATE_NEW_CONSOLE,
+                           env=env)
+        self.assertEqual(p.returncode, 0)
+
+        # Then test that FIleIO is used when PYTHONLEGACYWINDOWSSTDIO is set.
+        code = "import sys; sys.exit(type(sys.stdout.buffer.raw).__name__ != 'FileIO')"
+        env["PYTHONLEGACYWINDOWSSTDIO"] = "1"
+        p = subprocess.run([sys.executable, "-c", code],
+                           creationflags=subprocess.CREATE_NEW_CONSOLE,
+                           env=env)
+        self.assertEqual(p.returncode, 0)

    @unittest.skipIf("-fsanitize" in sysconfig.get_config_vars().get('PY_CFLAGS', ()),
                     "PYTHONMALLOCSTATS doesn't work with ASAN")