bpo-34485: Emit C locale coercion warning later (pythonGH-9002)

vstinner · web-flow · commit cf2150419492 · 2018-08-29T22:56:06.000+02:00
PYTHONCOERCELOCALE=warn warning is now emitted later and written into
sys.stderr, rather than being written into the C stderr stream.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -301,10 +301,8 @@ static const char *_C_LOCALE_WARNING =
 static void
 _emit_stderr_warning_for_legacy_locale(const _PyCoreConfig *core_config)
 {
-    if (core_config->coerce_c_locale_warn) {
-        if (_Py_LegacyLocaleDetected()) {
-            fprintf(stderr, "%s", _C_LOCALE_WARNING);
-        }
+    if (core_config->coerce_c_locale_warn && _Py_LegacyLocaleDetected()) {
+        PySys_FormatStderr("%s", _C_LOCALE_WARNING);
     }
 }
 
@@ -567,10 +565,6 @@ _Py_InitializeCore_impl(PyInterpreterState **interp_p,
      */
     _PyRuntime.finalizing = NULL;
 
-#ifndef MS_WINDOWS
-    _emit_stderr_warning_for_legacy_locale(core_config);
-#endif
-
     err = _Py_HashRandomization_Init(core_config);
     if (_Py_INIT_FAILED(err)) {
         return err;
@@ -867,6 +861,11 @@ _Py_InitializeMainInterpreter(PyInterpreterState *interp,
             return err;
         }
     }
+
+#ifndef MS_WINDOWS
+    _emit_stderr_warning_for_legacy_locale(core_config);
+#endif
+
     return _Py_INIT_OK();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -301,10 +301,8 @@ static const char *_C_LOCALE_WARNING =`
`301`	`301`	`static void`
`302`	`302`	`_emit_stderr_warning_for_legacy_locale(const _PyCoreConfig *core_config)`
`303`	`303`	`{`
`304`		`- if (core_config->coerce_c_locale_warn) {`
`305`		`- if (_Py_LegacyLocaleDetected()) {`
`306`		`- fprintf(stderr, "%s", _C_LOCALE_WARNING);`
`307`		`- }`
	`304`	`+ if (core_config->coerce_c_locale_warn && _Py_LegacyLocaleDetected()) {`
	`305`	`+ PySys_FormatStderr("%s", _C_LOCALE_WARNING);`
`308`	`306`	`}`
`309`	`307`	`}`
`310`	`308`
`@@ -567,10 +565,6 @@ _Py_InitializeCore_impl(PyInterpreterState **interp_p,`
`567`	`565`	`*/`
`568`	`566`	`_PyRuntime.finalizing = NULL;`
`569`	`567`
`570`		`-#ifndef MS_WINDOWS`
`571`		`- _emit_stderr_warning_for_legacy_locale(core_config);`
`572`		`-#endif`
`573`		`-`
`574`	`568`	`err = _Py_HashRandomization_Init(core_config);`
`575`	`569`	`if (_Py_INIT_FAILED(err)) {`
`576`	`570`	`return err;`
`@@ -867,6 +861,11 @@ _Py_InitializeMainInterpreter(PyInterpreterState *interp,`
`867`	`861`	`return err;`
`868`	`862`	`}`
`869`	`863`	`}`
	`864`	`+`
	`865`	`+#ifndef MS_WINDOWS`
	`866`	`+ _emit_stderr_warning_for_legacy_locale(core_config);`
	`867`	`+#endif`
	`868`	`+`
`870`	`869`	`return _Py_INIT_OK();`
`871`	`870`	`}`
`872`	`871`