mirror of
https://github.com/python/cpython.git
synced 2024-11-24 18:34:43 +08:00
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:
parent
4ead7c7be8
commit
da1ddf37c6
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user