diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2012-12-03 11:48:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2012-12-03 11:48:53 (GMT) |
| commit | 2660e427d1abcae9fc60115c45619ed2286fc560 (patch) | |
| tree | 2bc8119cac17fb963f323f964f8774cffbaa1879 /Modules/python.c | |
| parent | a2816c2b11aeb24b232570b4073a9644bfdd82c7 (diff) | |
| parent | 27b1ca29ccf523e736a47c02f554de5374e241fc (diff) | |
| download | cpython-2660e427d1abcae9fc60115c45619ed2286fc560.zip cpython-2660e427d1abcae9fc60115c45619ed2286fc560.tar.gz cpython-2660e427d1abcae9fc60115c45619ed2286fc560.tar.bz2 | |
(Merge 3.2) Issue #16416: On Mac OS X, operating system 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/python.c')
| -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: " |