summaryrefslogtreecommitdiff
path: root/Python/codecs.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-12-03 20:56:27 +0100
committerAntoine Pitrou <solipsis@pitrou.net>2012-12-03 20:56:27 +0100
commit3575597ccfa3f7a6cca57ee738198c4047a4cfce (patch)
treee35bbd931fa375177c19333dfeae9f74481479a3 /Python/codecs.c
parentae0f016ce4eb72a3c4f18bb82a3f2fc9ae952dfa (diff)
parentb8547bd979ebb8ce16b64c4cf0fdf1e3d59f965a (diff)
downloadcpython-3575597ccfa3f7a6cca57ee738198c4047a4cfce.tar.gz
Split the bigmem re test in two separate tests with different memory requirements.
Diffstat (limited to 'Python/codecs.c')
-rw-r--r--Python/codecs.c4
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;
}