python
diff --git a/‎Modules/main.c‎
Lines changed: 6 additions & 1 deletion b/‎Modules/main.c‎
Lines changed: 6 additions & 1 deletion
@@ -1982,6 +1982,7 @@ pymain_read_conf_impl(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
 static int
 pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
 {
+    int init_utf8_mode = Py_UTF8Mode;
     _PyCoreConfig *config = &pymain->config;
     _PyCoreConfig save_config = _PyCoreConfig_INIT;
     int res = -1;
@@ -2016,6 +2017,10 @@ pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
             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, cmdline) < 0) {
             goto done;
         }
@@ -2086,7 +2091,7 @@ pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
         setlocale(LC_ALL, oldloc);
         PyMem_RawFree(oldloc);
     }
-
+    Py_UTF8Mode = init_utf8_mode ;
     return res;
 }
Original file line number	Diff line number	Diff line change
`@@ -1982,6 +1982,7 @@ pymain_read_conf_impl(_PyMain pymain, _Py_CommandLineDetails cmdline)`
`1982`	`1982`	`static int`
`1983`	`1983`	`pymain_read_conf(_PyMain pymain, _Py_CommandLineDetails cmdline)`
`1984`	`1984`	`{`
	`1985`	`+ int init_utf8_mode = Py_UTF8Mode;`
`1985`	`1986`	`_PyCoreConfig *config = &pymain->config;`
`1986`	`1987`	`_PyCoreConfig save_config = _PyCoreConfig_INIT;`
`1987`	`1988`	`int res = -1;`
`@@ -2016,6 +2017,10 @@ pymain_read_conf(_PyMain pymain, _Py_CommandLineDetails cmdline)`
`2016`	`2017`	`goto done;`
`2017`	`2018`	`}`
`2018`	`2019`
	`2020`	`+ /* bpo-34207: Py_DecodeLocale(), Py_EncodeLocale() and similar`
	`2021`	`+ functions depend on Py_UTF8Mode. */`
	`2022`	`+ Py_UTF8Mode = config->utf8_mode;`
	`2023`	`+`
`2019`	`2024`	`if (pymain_init_cmdline_argv(pymain, cmdline) < 0) {`
`2020`	`2025`	`goto done;`
`2021`	`2026`	`}`
`@@ -2086,7 +2091,7 @@ pymain_read_conf(_PyMain pymain, _Py_CommandLineDetails cmdline)`
`2086`	`2091`	`setlocale(LC_ALL, oldloc);`
`2087`	`2092`	`PyMem_RawFree(oldloc);`
`2088`	`2093`	`}`
`2089`		`-`
	`2094`	`+ Py_UTF8Mode = init_utf8_mode ;`
`2090`	`2095`	`return res;`
`2091`	`2096`	`}`
`2092`	`2097`