diff options
| author | Eric V. Smith <eric@trueblade.com> | 2013-07-02 09:07:53 -0400 |
|---|---|---|
| committer | Eric V. Smith <eric@trueblade.com> | 2013-07-02 09:07:53 -0400 |
| commit | 3df17fc294944998cee11b83e0fae62774cd0afe (patch) | |
| tree | 3238348243c6a8486e303e3b5377bd67ccbebe89 /Python/codecs.c | |
| parent | 877e273d143bc8af38641ffd47dfff3a0df9d4f3 (diff) | |
| parent | d445ec98e578d23ef46470e13d560532a9f6c28e (diff) | |
| download | cpython-3df17fc294944998cee11b83e0fae62774cd0afe.tar.gz | |
#18312: merge from 3.3.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index fd67d1b9e1..8d9ce6f496 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; } @@ -1026,7 +1026,7 @@ static int _PyCodecRegistry_Init(void) if (interp->codec_error_registry) { for (i = 0; i < Py_ARRAY_LENGTH(methods); ++i) { - PyObject *func = PyCFunction_New(&methods[i].def, NULL); + PyObject *func = PyCFunction_NewEx(&methods[i].def, NULL, NULL); int res; if (!func) Py_FatalError("can't initialize codec error registry"); |