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

vstinner · web-flow · commit 0e1312c959dc · 2018-11-19T10:05:55.000+01:00
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
@@ -492,6 +492,8 @@ def test_init_from_config(self):
             '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 @@ def test_init_env(self):
         }
         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)
 

Original file line number	Diff line number	Diff line change
`@@ -492,6 +492,8 @@ def test_init_from_config(self):`
`492`	`492`	`'faulthandler': 1,`
`493`	`493`	`}`
`494`	`494`	`global_config = {`
	`495`	`+ 'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,`
	`496`	`+ 'Py_FileSystemDefaultEncoding': 'utf-8',`
`495`	`497`	`'Py_NoUserSiteDirectory': 0,`
`496`	`498`	`}`
`497`	`499`	`self.check_config("init_from_config", core_config, global_config)`
`@@ -510,13 +512,13 @@ def test_init_env(self):`
`510`	`512`	`}`
`511`	`513`	`global_config = {`
`512`	`514`	`'Py_DontWriteBytecodeFlag': 1,`
	`515`	`+ 'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,`
	`516`	`+ 'Py_FileSystemDefaultEncoding': 'utf-8',`
`513`	`517`	`'Py_InspectFlag': 1,`
`514`	`518`	`'Py_NoUserSiteDirectory': 1,`
`515`	`519`	`'Py_OptimizeFlag': 2,`
`516`	`520`	`'Py_UnbufferedStdioFlag': 1,`
`517`	`521`	`'Py_VerboseFlag': 1,`
`518`		`- 'Py_FileSystemDefaultEncoding': 'utf-8',`
`519`		`- 'Py_FileSystemDefaultEncodeErrors': self.UTF8_MODE_ERRORS,`
`520`	`522`	`}`
`521`	`523`	`self.check_config("init_env&quo 3DBA t;, core_config, global_config)`
`522`	`524`