diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-11-18 10:42:42 +0000 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-11-18 10:42:42 +0000 |
| commit | 2e2651edeaf7a5a02e249147d36af573ce1ae6f8 (patch) | |
| tree | 91762059f6781f06f0838947afd632f532416ff2 /Python/codecs.c | |
| parent | ef6a13f37d15a322940c88d8884199e0ba8ccbb1 (diff) | |
| parent | 43dab9533424996db42b4496f4e92944aca5b783 (diff) | |
| download | cpython-2e2651edeaf7a5a02e249147d36af573ce1ae6f8.tar.gz | |
Merge typo fix from 3.3.
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 fd67d1b9e1..37ae41b1ca 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; } |