diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-09-12 14:03:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 14:03:18 (GMT) |
| commit | b3613815d4550a611e67a9c97f616c97124b6495 (patch) | |
| tree | cd207743ff8645c9942aeb31711ea2a346181a07 | |
| parent | bcd59070d0ba2c0a6df08688e48578314cda92c1 (diff) | |
| download | cpython-b3613815d4550a611e67a9c97f616c97124b6495.zip cpython-b3613815d4550a611e67a9c97f616c97124b6495.tar.gz cpython-b3613815d4550a611e67a9c97f616c97124b6495.tar.bz2 | |
[3.12] gh-109237: Fix test_site for non-ASCII working directory (GH-109238) (#109239)
gh-109237: Fix test_site for non-ASCII working directory (GH-109238)
Fix test_site.test_underpth_basic() when the working directory
contains at least one non-ASCII character: encode the "._pth" file to
UTF-8 and enable the UTF-8 Mode to use UTF-8 for the child process
stdout.
(cherry picked from commit cbb3a6f8ada3d133c3ab9f9465b65067fce5bb42)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/test/test_site.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2023-09-10-22-32-20.gh-issue-109237.SvgKwD.rst | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 20a9616..e8ec3b3 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -576,7 +576,7 @@ class _pthFileTests(unittest.TestCase): _pth_file = os.path.splitext(exe_file)[0] + '._pth' else: _pth_file = os.path.splitext(dll_file)[0] + '._pth' - with open(_pth_file, 'w') as f: + with open(_pth_file, 'w', encoding='utf8') as f: for line in lines: print(line, file=f) return exe_file @@ -613,7 +613,7 @@ class _pthFileTests(unittest.TestCase): os.path.dirname(exe_file), pth_lines) - output = subprocess.check_output([exe_file, '-c', + output = subprocess.check_output([exe_file, '-X', 'utf8', '-c', 'import sys; print("\\n".join(sys.path) if sys.flags.no_site else "")' ], encoding='utf-8', errors='surrogateescape') actual_sys_path = output.rstrip().split('\n') diff --git a/Misc/NEWS.d/next/Tests/2023-09-10-22-32-20.gh-issue-109237.SvgKwD.rst b/Misc/NEWS.d/next/Tests/2023-09-10-22-32-20.gh-issue-109237.SvgKwD.rst new file mode 100644 index 0000000..1d762bb --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2023-09-10-22-32-20.gh-issue-109237.SvgKwD.rst @@ -0,0 +1,4 @@ +Fix ``test_site.test_underpth_basic()`` when the working directory contains +at least one non-ASCII character: encode the ``._pth`` file to UTF-8 and +enable the UTF-8 Mode to use UTF-8 for the child process stdout. Patch by +Victor Stinner. |