https://github.com/python/cpython/commit/ecf8cfe85fcbb946d151079bb8f393df4b80c061
commit: ecf8cfe85fcbb946d151079bb8f393df4b80c061
branch: 3.15
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2026-11-19T21:46:03+01:00
summary:

[3.15] Backport regrtest changes from the main branch (#162281)

* Enhance encodings in regrtest header (#161959)

If the UTF-8 mode is disabled and/or if PYTHONCOERCECLOCALE
environment variable is set to "0": mention it in the "== encodings"
regrtest header.

If the locale encoding and the filesystem encoding are equal,
log "locale=FS=<encoding>" to have a shorter output.

On Windows, log ANSI and OEM code pages.

Backport to 3.15: add types and _winapi imports to libregrtest.utils.

(cherry picked from commit f4fbacf64a094e4ae8a8052b28331a3eee178035)

* Display test header when running python -m test --tsan (#162249)

When running "python -m test" with --tsan or --tsan-parallel,
display the test header (log TSAN_OPTIONS env var).

(cherry picked from commit 53f4cad43b87292aca163ea5a92d130bd024981d)

* Add missing types import

files:
M Lib/test/libregrtest/main.py
M Lib/test/libregrtest/utils.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 62f66adadebbb18..f00c352f29b52c5 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -203,9 +203,11 @@ def find_tests(self, tests: TestList | None = None) -> 
tuple[TestTuple, TestList
 
         if self.tsan:
             setup_tsan_tests(self.cmdline_args)
+            self.want_header = True
 
         if self.tsan_parallel:
             setup_tsan_parallel_tests(self.cmdline_args)
+            self.want_header = True
 
         alltests = findtests(testdir=self.test_dir,
                              exclude=exclude_tests)
diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py
index 50c7b7c00d14ef1..931933b6fa27153 100644
--- a/Lib/test/libregrtest/utils.py
+++ b/Lib/test/libregrtest/utils.py
@@ -12,7 +12,13 @@
 import sysconfig
 import tempfile
 import textwrap
+import types
 from collections.abc import Callable
+_winapi: types.ModuleType | None
+try:
+    import _winapi
+except ImportError:
+    _winapi = None
 
 from test import support
 from test.support import os_helper
@@ -655,8 +661,32 @@ def display_header(use_resources: dict[str, str | None],
         if process_cpu_count and process_cpu_count != cpu_count:
             cpu_count = f"{process_cpu_count} (process) / {cpu_count} (system)"
         print("== CPU count:", cpu_count)
-    print("== encodings: locale=%s FS=%s"
-          % (locale.getencoding(), sys.getfilesystemencoding()))
+
+    encodings = []
+    if _winapi is not None:
+        # Log ANSI and OEM code pages
+        ansi = f'cp{_winapi.GetACP()}'
+        oem = f'cp{_winapi.GetOEMCP()}'
+        if ansi == oem:
+            encodings.append(f'ansi=oem={ansi}')
+        else:
+            encodings.append(f'ansi={ansi}')
+            encodings.append(f'oem={oem}')
+        encodings.append(f'FS={sys.getfilesystemencoding()}')
+    else:
+        locale_encoding = locale.getencoding()     # nl_langinfo(CODESET)
+        fs_encoding = sys.getfilesystemencoding()  # normalized name
+        if locale_encoding.lower() == fs_encoding.lower():
+            encodings.append(f'locale=FS={fs_encoding}')
+        else:
+            encodings.append(f'locale={locale_encoding}')
+            encodings.append(f'FS={fs_encoding}')
+    if not sys.flags.utf8_mode:
+        encodings.append('utf8=0')
+    if (not sys.flags.ignore_environment
+        and os.environ.get('PYTHONCOERCECLOCALE') == '0'):
+        encodings.append('coerce=0')
+    print(f"== encodings: {' '.join(encodings)}")
 
     if use_resources:
         text = format_resources(use_resources)

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to