Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

charmap_encoding_error() uses the new Unicode API

This commit is contained in:
Victor Stinner 2011-11-20 18:28:55 +01:00
parent 7c8bbbbb0c
commit ae4f7c8e59
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Objects/unicodeobject.c
View File

@ -8087,7 +8087,9 @@ charmap_encoding_error(
PyObject *repunicode = NULL; /* initialize to prevent gcc warning */
Py_ssize_t size, repsize;
Py_ssize_t newpos;
Py_UNICODE *uni2;
enum PyUnicode_Kind kind;
void *data;
Py_ssize_t index;
/* startpos for collecting unencodable chars */
Py_ssize_t collstartpos = *inpos;
Py_ssize_t collendpos = *inpos+1;
@ -8201,10 +8203,18 @@ charmap_encoding_error(
break;
}
/* generate replacement */
if (PyUnicode_READY(repunicode) < 0) {
Py_DECREF(repunicode);
return -1;
}
repsize = PyUnicode_GET_SIZE(repunicode);
for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) {
x = charmapencode_output(*uni2, mapping, res, respos);
data = PyUnicode_DATA(repunicode);
kind = PyUnicode_KIND(repunicode);
for (index = 0; index < repsize; index++) {
Py_UCS4 repch = PyUnicode_READ(kind, data, index);
x = charmapencode_output(repch, mapping, res, respos);
if (x==enc_EXCEPTION) {
Py_DECREF(repunicode);
return -1;
}
else if (x==enc_FAILED) {