From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 1 Feb 2022 11:31:49 +0000 (-0800)
Subject: [3.9] bpo-44031: fix test_tabnanny failure in non-ascii CWD (GH-31014) (GH-31048)
X-Git-Tag: v3.9.11~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e9f77f9d4fc282666ff85051b6e7ade0eed1d4c;p=thirdparty%2FPython%2Fcpython.git

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



(cherry picked from commit 108e66b6d23efd0fc2966163ead9434b328c5f17)


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

Automerge-Triggered-By: GH:iritkatriel
---

diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 95840d6ac0c5..7f3308d745aa 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -292,8 +292,8 @@ class TestCommandLine(TestCase):
         _, 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()