summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-12-02 15:53:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-12-02 15:53:41 (GMT)
commitaff472394cf29c7712854043fbac6a032195fe77 (patch)
tree1817b8ab8c24a3d5f88946ed6237eaa5b0359e7c /Modules
parent6e61d18891baf0c173464ae37464ec995889080a (diff)
downloadcpython-aff472394cf29c7712854043fbac6a032195fe77.zip
cpython-aff472394cf29c7712854043fbac6a032195fe77.tar.gz
cpython-aff472394cf29c7712854043fbac6a032195fe77.tar.bz2
unicode -> str
Diffstat (limited to 'Modules')
-rw-r--r--Modules/cjkcodecs/multibytecodec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index abad251..40717d8 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -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;
}