commit 700cfa8c90a90016638bac13c4efd03786b2b2a0
author Serhiy Storchaka <storchaka@gmail.com> Thu Jun 25 17:56:31 2020 +0300
committer GitHub <noreply@github.com> Thu Jun 25 17:56:31 2020 +0300
tree 62994f7b8d6fccd910d5f65bd6cd49a4f72bf8ae
parent 8ea6353f60625c96ce96588c70ff24a77f8c71f9

bpo-41069: Make TESTFN and the CWD for tests containing non-ascii characters. (GH-21035)

Lib/test/test_cgitb.py

diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py
index 8991bc1..bab152d 100644
--- a/Lib/test/test_cgitb.py
+++ b/Lib/test/test_cgitb.py
@@ -41,8 +41,9 @@
             rc, out, err = assert_python_failure(
                   '-c',
                   ('import cgitb; cgitb.enable(logdir=%s); '
-                   'raise ValueError("Hello World")') % repr(tracedir))
-        out = out.decode(sys.getfilesystemencoding())
+                   'raise ValueError("Hello World")') % repr(tracedir),
+                  PYTHONIOENCODING='utf-8')
+        out = out.decode()
         self.assertIn("ValueError", out)
         self.assertIn("Hello World", out)
         self.assertIn("<strong>&lt;module&gt;</strong>", out)
@@ -56,8 +57,9 @@
             rc, out, err = assert_python_failure(
                   '-c',
                   ('import cgitb; cgitb.enable(format="text", logdir=%s); '
-                   'raise ValueError("Hello World")') % repr(tracedir))
-        out = out.decode(sys.getfilesystemencoding())
+                   'raise ValueError("Hello World")') % repr(tracedir),
+                  PYTHONIOENCODING='utf-8')
+        out = out.decode()
         self.assertIn("ValueError", out)
         self.assertIn("Hello World", out)
         self.assertNotIn('<p>', out)