mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.3

Browse source
This commit is contained in:
Benjamin Peterson 2012-12-02 10:53:48 -05:00
commit 3d490d4eff
1 changed files with 3 additions and 3 deletions
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))) { !PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"encoding error handler must return " "encoding error handler must return "
"(unicode, int) tuple"); "(str, int) tuple");
goto errorexit; goto errorexit;
} }
@ -439,7 +439,7 @@ multibytecodec_decerror(MultibyteCodec *codec,
!PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) { !PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"decoding error handler must return " "decoding error handler must return "
"(unicode, int) tuple"); "(str, int) tuple");
goto errorexit; goto errorexit;
} }
@ -760,7 +760,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
return NULL; return NULL;
else if (!PyUnicode_Check(unistr)) { else if (!PyUnicode_Check(unistr)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"couldn't convert the object to unicode."); "couldn't convert the object to str.");
Py_DECREF(ucvt); Py_DECREF(ucvt);
return NULL; return NULL;
} }