diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-09-19 12:01:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 12:01:52 -0700 |
| commit | 95cc3ee00cfa079751ae2bb9a8d3387053b50489 (patch) | |
| tree | 9100630fcae5cd45caaf00aeff5e5f823646e162 /Include | |
| parent | 73c0006e71683b7d5b28192f18a2b9796e4195ef (diff) | |
| download | cpython-git-95cc3ee00cfa079751ae2bb9a8d3387053b50489.tar.gz | |
Revert "[3.7] bpo-34589: Add -X coerce_c_locale option; C locale coercion off by default (GH-9379)" (GH-9416)
This reverts commit 144f1e2c6f4a24bd288c045986842c65cc289684.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pylifecycle.h | 4 | ||||
| -rw-r--r-- | Include/pystate.h | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 68fc036479..1192961949 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -119,11 +119,7 @@ PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); /* Bootstrap __main__ (defined in Modules/main.c) */ PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv); #ifdef Py_BUILD_CORE -# ifdef MS_WINDOWS -PyAPI_FUNC(int) _Py_WindowsMain(int argc, wchar_t **argv); -# else PyAPI_FUNC(int) _Py_UnixMain(int argc, char **argv); -# endif #endif /* In getpath.c */ diff --git a/Include/pystate.h b/Include/pystate.h index c2ccb203db..f16ffb8fd2 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -41,6 +41,8 @@ typedef struct { int show_alloc_count; /* -X showalloccount */ int dump_refs; /* PYTHONDUMPREFS */ int malloc_stats; /* PYTHONMALLOCSTATS */ + int coerce_c_locale; /* PYTHONCOERCECLOCALE, -1 means unknown */ + int coerce_c_locale_warn; /* PYTHONCOERCECLOCALE=warn */ int utf8_mode; /* PYTHONUTF8, -X utf8; -1 means unknown */ wchar_t *program_name; /* Program name, see also Py_GetProgramName() */ @@ -72,8 +74,6 @@ typedef struct { /* Private fields */ int _disable_importlib; /* Needed by freeze_importlib */ - int _coerce_c_locale; /* PYTHONCOERCECLOCALE, -1 means unknown */ - int _coerce_c_locale_warn; /* PYTHONCOERCECLOCALE=warn */ } _PyCoreConfig; #define _PyCoreConfig_INIT \ @@ -81,8 +81,7 @@ typedef struct { .install_signal_handlers = -1, \ .ignore_environment = -1, \ .use_hash_seed = -1, \ - ._coerce_c_locale = 0, \ - ._coerce_c_locale_warn = 0, \ + .coerce_c_locale = -1, \ .faulthandler = -1, \ .tracemalloc = -1, \ .utf8_mode = -1, \ |