diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-03-06 00:09:24 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-03-06 00:09:24 (GMT) |
| commit | cf77da9fb5a0b23c92c5005b13944f680aa0f325 (patch) | |
| tree | c92d86dc211f8f51b08cda4cd7eea39d24c957e1 /Objects/unicodeobject.c | |
| parent | 313cac88c524dd1d3c9810109de3f9c310d73413 (diff) | |
| download | cpython-cf77da9fb5a0b23c92c5005b13944f680aa0f325.zip cpython-cf77da9fb5a0b23c92c5005b13944f680aa0f325.tar.gz cpython-cf77da9fb5a0b23c92c5005b13944f680aa0f325.tar.bz2 | |
Backed out changeset b9f7b1bf36aa
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 00a6a36..2175655 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1384,18 +1384,13 @@ find_maxchar_surrogates(const wchar_t *begin, const wchar_t *end, for (iter = begin; iter < end; ) { #if SIZEOF_WCHAR_T == 2 - if (Py_UNICODE_IS_HIGH_SURROGATE(iter[0])) { - if ((iter+1) < end - && Py_UNICODE_IS_LOW_SURROGATE(iter[1])) - { - ch = Py_UNICODE_JOIN_SURROGATES(iter[0], iter[1]); - ++(*num_surrogates); - iter += 2; - } - else { - PyErr_SetString(PyExc_ValueError, "illegal UTF-16 surrogate"); - return -1; - } + if (Py_UNICODE_IS_HIGH_SURROGATE(iter[0]) + && (iter+1) < end + && Py_UNICODE_IS_LOW_SURROGATE(iter[1])) + { + ch = Py_UNICODE_JOIN_SURROGATES(iter[0], iter[1]); + ++(*num_surrogates); + iter += 2; } else #endif |