|
21 | 21 | from test.libregrtest.setup import setup_tests
|
22 | 22 | from test.libregrtest.utils import format_duration, print_warning
|
23 | 23 |
|
24 |
| -if sys.platform == 'win32': |
25 |
| - import locale |
26 |
| - |
27 | 24 |
|
28 | 25 | # Display the running tests if nothing happened last N seconds
|
29 | 26 | PROGRESS_UPDATE = 30.0 # seconds
|
@@ -262,16 +259,11 @@ def _run_process(self, test_name: str, stdout_fh: TextIO) -> int:
|
262 | 259 | self.current_test_name = None
|
263 | 260 |
|
264 | 261 | def _runtest(self, test_name: str) -> MultiprocessResult:
|
265 |
| - if sys.platform == 'win32': |
266 |
| - # gh-95027: When stdout is not a TTY, Python uses the ANSI code |
267 |
| - # page for the sys.stdout encoding. If the main process runs in a |
268 |
| - # terminal, sys.stdout uses WindowsConsoleIO with UTF-8 encoding. |
269 |
| - encoding = locale.getencoding() |
270 |
| - else: |
271 |
| - encoding = sys.stdout.encoding |
272 | 262 | # gh-94026: Write stdout+stderr to a tempfile as workaround for
|
273 | 263 | # non-blocking pipes on Emscripten with NodeJS.
|
274 |
| - with tempfile.TemporaryFile('w+', encoding=encoding) as stdout_fh: |
| 264 | + with tempfile.TemporaryFile( |
| 265 | + 'w+', encoding=sys.stdout.encoding |
| 266 | + ) as stdout_fh: |
275 | 267 | # gh-93353: Check for leaked temporary files in the parent process,
|
276 | 268 | # since the deletion of temporary files can happen late during
|
277 | 269 | # Python finalization: too late for libregrtest.
|
|
0 commit comments