diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2012-11-12 22:04:02 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2012-11-12 22:04:02 (GMT) |
| commit | e262377cabc59f0c7d574ce608b61f692601608b (patch) | |
| tree | f70a1f34134501f41479f9648cc793d815bf0717 /Modules | |
| parent | 29824550b1758bc96c24749ce5772e33d1615599 (diff) | |
| download | cpython-e262377cabc59f0c7d574ce608b61f692601608b.zip cpython-e262377cabc59f0c7d574ce608b61f692601608b.tar.gz cpython-e262377cabc59f0c7d574ce608b61f692601608b.tar.bz2 | |
Issue #16416: OS data are now always encoded/decoded to/from
UTF-8/surrogateescape, instead of the locale encoding (which may be ASCII if no
locale environment variable is set), to avoid inconsistencies with
os.fsencode() and os.fsdecode() functions which are already using
UTF-8/surrogateescape.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/python.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Modules/python.c b/Modules/python.c index c70bf37..2c08b96 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -15,10 +15,6 @@ wmain(int argc, wchar_t **argv) } #else -#ifdef __APPLE__ -extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size); -#endif - int main(int argc, char **argv) { @@ -45,11 +41,7 @@ main(int argc, char **argv) oldloc = strdup(setlocale(LC_ALL, NULL)); setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { -#ifdef __APPLE__ - argv_copy[i] = _Py_DecodeUTF8_surrogateescape(argv[i], strlen(argv[i])); -#else argv_copy[i] = _Py_char2wchar(argv[i], NULL); -#endif if (!argv_copy[i]) { free(oldloc); fprintf(stderr, "Fatal Python error: " |