From: Victor Stinner <vstinner@python.org>
Date: Mon, 7 Sep 2020 15:27:03 +0000 (+0200)
Subject: bpo-41401: Fix test_fspath_support in test_io. (GH-21640) (GH-22133) (GH-22135)
X-Git-Tag: v3.8.6rc1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84105cbaa395923e3584a87d67ccce72c8420bb4;p=thirdparty%2FPython%2Fcpython.git

bpo-41401: Fix test_fspath_support in test_io. (GH-21640) (GH-22133) (GH-22135)

The error is exposed on non-UTF-8 locales.

(cherry picked from commit 67987acd5dc9776f55f4e139e2b3d9e7a6434d9f)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit c73ee5acc96b4bbd6885156883b224b8cc3e470c)
---

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index bea4342e7f0f..8eef332b8e4b 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -922,7 +922,7 @@ class IOTest(unittest.TestCase):
                 self.assertEqual(f.read(), "egg\n")
 
         check_path_succeeds(FakePath(support.TESTFN))
-        check_path_succeeds(FakePath(support.TESTFN.encode('utf-8')))
+        check_path_succeeds(FakePath(os.fsencode(support.TESTFN)))
 
         with self.open(support.TESTFN, "w") as f:
             bad_path = FakePath(f.fileno())