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

Merge heads

This commit is contained in:
Petri Lehtinen 2011-11-04 22:36:54 +02:00
parent c9f38462ee c06bb7affd
commit 245a94b6e8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Python/codecs.c
View File

@ -573,7 +573,7 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
PyObject *restuple; PyObject *restuple;
PyObject *object; PyObject *object;
Py_ssize_t i, o; Py_ssize_t i;
Py_ssize_t start; Py_ssize_t start;
Py_ssize_t end; Py_ssize_t end;
PyObject *res; PyObject *res;
@ -612,7 +612,7 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
} }
outp = PyUnicode_1BYTE_DATA(res); outp = PyUnicode_1BYTE_DATA(res);
/* generate replacement */ /* generate replacement */
for (i = start, o = 0; i < end; ++i) { for (i = start; i < end; ++i) {
int digits; int digits;
int base; int base;
ch = PyUnicode_READ_CHAR(object, i); ch = PyUnicode_READ_CHAR(object, i);
@ -778,7 +778,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc)
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
unsigned char *p; unsigned char *p;
Py_UNICODE ch = 0; Py_UCS4 ch = 0;
if (PyUnicodeDecodeError_GetStart(exc, &start)) if (PyUnicodeDecodeError_GetStart(exc, &start))
return NULL; return NULL;
if (!(object = PyUnicodeDecodeError_GetObject(exc))) if (!(object = PyUnicodeDecodeError_GetObject(exc)))
@ -804,7 +804,10 @@ PyCodec_SurrogatePassErrors(PyObject *exc)
PyErr_SetObject(PyExceptionInstance_Class(exc), exc); PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
return NULL; return NULL;
} }
return Py_BuildValue("(u#n)", &ch, 1, start+3); res = PyUnicode_FromOrdinal(ch);
if (res == NULL)
return NULL;
return Py_BuildValue("(Nn)", res, start+3);
} }
else { else {
wrong_exception_type(exc); wrong_exception_type(exc);
@ -853,8 +856,9 @@ PyCodec_SurrogateEscapeErrors(PyObject *exc)
return restuple; return restuple;
} }
else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) { else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
PyObject *str;
unsigned char *p; unsigned char *p;
Py_UNICODE ch[4]; /* decode up to 4 bad bytes. */ Py_UCS2 ch[4]; /* decode up to 4 bad bytes. */
int consumed = 0; int consumed = 0;
if (PyUnicodeDecodeError_GetStart(exc, &start)) if (PyUnicodeDecodeError_GetStart(exc, &start))
return NULL; return NULL;
@ -879,7 +883,10 @@ PyCodec_SurrogateEscapeErrors(PyObject *exc)
PyErr_SetObject(PyExceptionInstance_Class(exc), exc); PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
return NULL; return NULL;
} }
return Py_BuildValue("(u#n)", ch, consumed, start+consumed); str = PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, ch, consumed);
if (str == NULL)
return NULL;
return Py_BuildValue("(Nn)", str, start+consumed);
} }
else { else {
wrong_exception_type(exc); wrong_exception_type(exc);