pythoncapi
diff --git a/‎Modules/main.c‎
Lines changed: 6 additions & 0 deletions b/‎Modules/main.c‎
Lines changed: 6 additions & 0 deletions
@@ -1286,6 +1286,7 @@ static int
 pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config,
                  _PyCmdline *cmdline)
 {
+    int init_utf8_mode = Py_UTF8Mode;
     _PyCoreConfig save_config = _PyCoreConfig_INIT;
     char *oldloc = NULL;
     int res = -1;
@@ -1319,6 +1320,10 @@ pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config,
             goto done;
         }
 
+        /* bpo-34207: Py_DecodeLocale(), Py_EncodeLocale() and similar
+           functions depend on Py_UTF8Mode. */
+        Py_UTF8Mode = config->utf8_mode;
+
         if (pymain_init_cmdline_argv(pymain, config, cmdline) < 0) {
             goto done;
         }
@@ -1383,6 +1388,7 @@ pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config,
         setlocale(LC_ALL, oldloc);
         PyMem_RawFree(oldloc);
     }
+    Py_UTF8Mode = init_utf8_mode ;
     return res;
 }
Original file line number	Diff line number	Diff line change
`@@ -1286,6 +1286,7 @@ static int`
`1286`	`1286`	`pymain_read_conf(_PyMain pymain, _PyCoreConfig config,`
`1287`	`1287`	`_PyCmdline *cmdline)`
`1288`	`1288`	`{`
	`1289`	`+ int init_utf8_mode = Py_UTF8Mode;`
`1289`	`1290`	`_PyCoreConfig save_config = _PyCoreConfig_INIT;`
`1290`	`1291`	`char *oldloc = NULL;`
`1291`	`1292`	`int res = -1;`
`@@ -1319,6 +1320,10 @@ pymain_read_conf(_PyMain pymain, _PyCoreConfig config,`
`1319`	`1320`	`goto done;`
`1320`	`1321`	`}`
`1321`	`1322`
	`1323`	`+ /* bpo-34207: Py_DecodeLocale(), Py_EncodeLocale() and similar`
	`1324`	`+ functions depend on Py_UTF8Mode. */`
	`1325`	`+ Py_UTF8Mode = config->utf8_mode;`
	`1326`	`+`
`1322`	`1327`	`if (pymain_init_cmdline_argv(pymain, config, cmdline) < 0) {`
`1323`	`1328`	`goto done;`
`1324`	`1329`	`}`
`@@ -1383,6 +1388,7 @@ pymain_read_conf(_PyMain pymain, _PyCoreConfig config,`
`1383`	`1388`	`setlocale(LC_ALL, oldloc);`
`1384`	`1389`	`PyMem_RawFree(oldloc);`
`1385`	`1390`	`}`
	`1391`	`+ Py_UTF8Mode = init_utf8_mode ;`
`1386`	`1392`	`return res;`
`1387`	`1393`	`}`
`1388`	`1394`