diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-12-02 15:53:48 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-12-02 15:53:48 (GMT) |
| commit | 3d490d4eff6980ab1577db5567d0ab457aa0c501 (patch) | |
| tree | e53323741672544d66515d0374735221d087e2f8 /Modules/cjkcodecs | |
| parent | 96e2cdbae9cdac048926dc36f8830da2854cd620 (diff) | |
| parent | aff472394cf29c7712854043fbac6a032195fe77 (diff) | |
| download | cpython-3d490d4eff6980ab1577db5567d0ab457aa0c501.zip cpython-3d490d4eff6980ab1577db5567d0ab457aa0c501.tar.gz cpython-3d490d4eff6980ab1577db5567d0ab457aa0c501.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Modules/cjkcodecs')
| -rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 6 |
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; } |