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

UnicodeTranslateError 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-21 01:17:27 +01:00
parent a1c03b0a58
commit 53b33e767d
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

@ -1751,8 +1751,8 @@ UnicodeTranslateError_str(PyObject *self)
if (reason_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 = "can't translate character '\\x%02x' in position %zd: %U";
@ -1762,7 +1762,7 @@ UnicodeTranslateError_str(PyObject *self)
fmt = "can't translate character '\\U%08x' in position %zd: %U";
result = PyUnicode_FromFormat(
fmt,
badchar,
(int)badchar,
uself->start,
reason_str
);