]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-35233: test_embed: fix filesystem encoding (GH-10597)
authorVictor Stinner <vstinner@redhat.com>
Mon, 19 Nov 2018 09:05:55 +0000 (10:05 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Nov 2018 09:05:55 +0000 (10:05 +0100)
Fix InitConfigTests: if utf8_mode is enabled, the expected filesystem
encoding is UTF-8.

Lib/test/test_embed.py

index e6c8c8070b8664d8f5e639ff9b1005f58e62dc41..89797d25c844832637f99b5d3138281f1d01fd09 100644 (file)
@@ -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)