traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UnicodeEncodeError uses the new Unicode API 

The index is a character index, not a index in a Py_UNICODE* string.
This commit is contained in:
Victor Stinner 2011-11-20 22:50:23 +01:00
parent 4ead7c7be8
commit da1ddf37c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/exceptions.c
View File

@ -1542,8 +1542,8 @@ UnicodeEncodeError_str(PyObject *self)
if (encoding_str == NULL)
goto done;
if (uself->start < PyUnicode_GET_SIZE(uself->object) && uself->end == uself->start+1) {
int badchar = (int)PyUnicode_AS_UNICODE(uself->object)[uself->start];
if (uself->start < PyUnicode_GET_LENGTH(uself->object) && uself->end == uself->start+1) {
Py_UCS4 badchar = PyUnicode_ReadChar(uself->object, uself->start);
const char *fmt;
if (badchar <= 0xff)
fmt = "'%U' codec can't encode character '\\x%02x' in position %zd: %U";
@ -1554,7 +1554,7 @@ UnicodeEncodeError_str(PyObject *self)
result = PyUnicode_FromFormat(
fmt,
encoding_str,
badchar,
(int)badchar,
uself->start,
reason_str);
}