diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-16 02:52:24 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-16 02:52:24 -0400 |
| commit | ddf47eb8c61ed4d3ee3ec680336b016b627e53dd (patch) | |
| tree | 7c238ff29a60d4957e6e26d336a6163f061d057d /Python/fileutils.c | |
| parent | f612c8fa7c1d6e244200a3eff0a82abcca4cca82 (diff) | |
| parent | cdfac6f16bec10dcb4885fd7f74ae80884d0cdf1 (diff) | |
| download | cpython-ddf47eb8c61ed4d3ee3ec680336b016b627e53dd.tar.gz | |
Merge with 3.3
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index b7c42e8e85..3c04e4969e 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -60,7 +60,7 @@ extern int _Py_normalize_encoding(const char *, char *, size_t); workaround is also enabled on error, for example if getting the locale failed. - Values of locale_is_ascii: + Values of force_ascii: 1: the workaround is used: _Py_wchar2char() uses encode_ascii_surrogateescape() and _Py_char2wchar() uses @@ -292,7 +292,7 @@ _Py_char2wchar(const char* arg, size_t *size) /* Only use the result if it contains no surrogate characters. */ for (tmp = res; *tmp != 0 && - (*tmp < 0xd800 || *tmp > 0xdfff); tmp++) + !Py_UNICODE_IS_SURROGATE(*tmp); tmp++) ; if (*tmp == 0) { if (size != NULL) @@ -338,7 +338,7 @@ _Py_char2wchar(const char* arg, size_t *size) memset(&mbs, 0, sizeof mbs); continue; } - if (*out >= 0xd800 && *out <= 0xdfff) { + if (Py_UNICODE_IS_SURROGATE(*out)) { /* Surrogate character. Escape the original byte sequence with surrogateescape. */ argsize -= converted; |