[Python-checkins] bpo-44031: fix test_tabnanny failure in non-ascii CWD (GH-31014)

miss-islington webhook-mailer at python.org
Tue Feb 1 06:20:20 EST 2022


https://github.com/python/cpython/commit/1dcd77280410e4b3bd7b0680f00a38cea466ebd1
commit: 1dcd77280410e4b3bd7b0680f00a38cea466ebd1
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-02-01T03:20:07-08:00
summary:

bpo-44031: fix test_tabnanny failure in non-ascii CWD (GH-31014)

(cherry picked from commit 108e66b6d23efd0fc2966163ead9434b328c5f17)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/test/test_tabnanny.py

diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 4dfbd2985d5b5..59fdfc5573d37 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -293,8 +293,8 @@ def validate_cmd(self, *args, stdout="", stderr="", partial=False):
         _, out, err = script_helper.assert_python_ok('-m', 'tabnanny', *args)
         # Note: The `splitlines()` will solve the problem of CRLF(\r) added
         # by OS Windows.
-        out = out.decode('ascii')
-        err = err.decode('ascii')
+        out = os.fsdecode(out)
+        err = os.fsdecode(err)
         if partial:
             for std, output in ((stdout, out), (stderr, err)):
                 _output = output.splitlines()



More information about the Python-checkins mailing list