diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2012-10-30 00:42:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2012-10-30 00:42:39 (GMT) |
| commit | 76df43de30f40b5cc1de9d36a5a083dd8bd8cb27 (patch) | |
| tree | be245b62c632a103851fa69d447e8d89e3ac782f /Python/codecs.c | |
| parent | a5e7cd06bb314f338eff3e2ef948ef35bed4487b (diff) | |
| download | cpython-76df43de30f40b5cc1de9d36a5a083dd8bd8cb27.zip cpython-76df43de30f40b5cc1de9d36a5a083dd8bd8cb27.tar.gz cpython-76df43de30f40b5cc1de9d36a5a083dd8bd8cb27.tar.bz2 | |
Issue #16330: Use surrogate-related macros
Patch written by Serhiy Storchaka.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index 5470500..5cfb1c9 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -761,7 +761,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc) for (i = start; i < end; i++) { /* object is guaranteed to be "ready" */ Py_UCS4 ch = PyUnicode_READ_CHAR(object, i); - if (ch < 0xd800 || ch > 0xdfff) { + if (!Py_UNICODE_IS_SURROGATE(ch)) { /* Not a surrogate, fail with original exception */ PyErr_SetObject(PyExceptionInstance_Class(exc), exc); Py_DECREF(res); @@ -797,7 +797,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc) (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); - if (ch < 0xd800 || ch > 0xdfff) + if (!Py_UNICODE_IS_SURROGATE(ch)) /* it's not a surrogate - fail */ ch = 0; } |