From: Victor Stinner <vstinner@redhat.com>
Date: Mon, 19 Nov 2018 09:05:55 +0000 (+0100)
Subject: bpo-35233: test_embed: fix filesystem encoding (GH-10597)
X-Git-Tag: v3.7.2rc1~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e1312c959dcfd0193ed0c7ab3fd45d440da6d78;p=thirdparty%2FPython%2Fcpython.git

bpo-35233: test_embed: fix filesystem encoding (GH-10597)

Fix InitConfigTests: if utf8_mode is enabled, the expected filesystem
encoding is UTF-8.
---

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index e6c8c8070b86..89797d25c844 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -492,6 +492,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
             'faulthandler': 1,
         }
         global_config = {
+            'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,
+            'Py_FileSystemDefaultEncoding': 'utf-8',
             'Py_NoUserSiteDirectory': 0,
         }
         self.check_config("init_from_config", core_config, global_config)
@@ -510,13 +512,13 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         }
         global_config = {
             'Py_DontWriteBytecodeFlag': 1,
+            'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,
+            'Py_FileSystemDefaultEncoding': 'utf-8',
             'Py_InspectFlag': 1,
             'Py_NoUserSiteDirectory': 1,
             'Py_OptimizeFlag': 2,
             'Py_UnbufferedStdioFlag': 1,
             'Py_VerboseFlag': 1,
-            'Py_FileSystemDefaultEncoding': 'utf-8',
-            'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,
         }
         self.check_config("init_env", core_config, global_config)