diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 21:36:22 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 21:36:22 +0200 |
| commit | 46f36c8eeef40dc1b68be5514ed8b52c14c374a2 (patch) | |
| tree | 5ae69bbff352be6084384242297ee677b4eec5b3 /Python/fileutils.c | |
| parent | 1a60c7a058d2b7cb5d844845e32376cef0c9b8f9 (diff) | |
| parent | 9653e7ac7f1e6ca106848def3bd3f0a59e349d10 (diff) | |
| download | cpython-46f36c8eeef40dc1b68be5514ed8b52c14c374a2.tar.gz | |
Merge typo fixes (and the fix for #8401 that I wrongly merged) with 3.3.
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 501cb8c8d6..526751d5ad 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -85,7 +85,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) @@ -131,7 +131,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; |