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

merge 3.3

This commit is contained in:
Benjamin Peterson 2012-12-02 10:53:48 -05:00
parent 96e2cdbae9 aff472394c
commit 3d490d4eff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/cjkcodecs/multibytecodec.c
View File

@ -320,7 +320,7 @@ multibytecodec_encerror(MultibyteCodec *codec,
!PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) {
PyErr_SetString(PyExc_TypeError,
"encoding error handler must return "
"(unicode, int) tuple");
"(str, int) tuple");
goto errorexit;
}
@ -439,7 +439,7 @@ multibytecodec_decerror(MultibyteCodec *codec,
!PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) {
PyErr_SetString(PyExc_TypeError,
"decoding error handler must return "
"(unicode, int) tuple");
"(str, int) tuple");
goto errorexit;
}
@ -760,7 +760,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
return NULL;
else if (!PyUnicode_Check(unistr)) {
PyErr_SetString(PyExc_TypeError,
"couldn't convert the object to unicode.");
"couldn't convert the object to str.");
Py_DECREF(ucvt);
return NULL;
}