diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-31 19:01:48 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-31 19:01:48 -0400 |
| commit | 7bcea02a3ec67d76ddd9e420747ba4154b5650ef (patch) | |
| tree | b130765e008ec99d6187906ce2ede20b0903a8a5 /Python/codecs.c | |
| parent | 8144eb153a29e607aa5ee1957e1723557f605ae6 (diff) | |
| parent | 2cbd5aa7a912ac7ab3953cea26707b77df3b5dca (diff) | |
| download | cpython-7bcea02a3ec67d76ddd9e420747ba4154b5650ef.tar.gz | |
merge 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 5470500577..5cfb1c9001 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; } |