[Python-checkins] cpython: charmap_encoding_error() uses the new Unicode API
victor.stinner
python-checkins at python.org
Sun Nov 20 22:53:21 CET 2011
http://hg.python.org/cpython/rev/9599b0346505
changeset: 73634:9599b0346505
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Sun Nov 20 18:28:55 2011 +0100
summary:
charmap_encoding_error() uses the new Unicode API
files:
Objects/unicodeobject.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8087,7 +8087,9 @@
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 @@
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) {
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list