diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-04-28 11:08:27 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-04-28 11:08:27 -0400 |
| commit | ae3dbb9b279701ee8378123ac74f2f5d59b2c377 (patch) | |
| tree | 30e8b2105a17dc98a78e98a0730d3235557a8c9c /Python/fileutils.c | |
| parent | 62e6455f78c85d5fa1c983a499ab089bd22e2c4e (diff) | |
| parent | 519ad453b3624294a5c7664208d3a4f8ac353cdc (diff) | |
| download | cpython-ae3dbb9b279701ee8378123ac74f2f5d59b2c377.tar.gz | |
Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
Behavior confirmation and initial patch by Jessica McKellar.
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; |