bpo-41385: Fix test_executable_without_cwd on Windows (pythonGH-21608)

shihai1991 · Aug 4, 2020 · d481884 · d481884
1 parent 004e82b
commit d481884
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -376,7 +376,9 @@ def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
         # matches *expected_cwd*.
         p = subprocess.Popen([python_arg, "-c",
                               "import os, sys; "
-                              "sys.stdout.write(os.getcwd()); "
+                              "buf = sys.stdout.buffer; "
+                              "buf.write(os.getcwd().encode()); "
+                              "buf.flush(); "
                               "sys.exit(47)"],
                               stdout=subprocess.PIPE,
                               **kwargs)
@@ -385,7 +387,7 @@ def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
         self.assertEqual(47, p.returncode)
         normcase = os.path.normcase
         self.assertEqual(normcase(expected_cwd),
-                         normcase(p.stdout.read().decode("utf-8")))
+                         normcase(p.stdout.read().decode()))
 
     def test_cwd(self):
         # Check that cwd changes the cwd for the child process.