From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 15:53:41 +0000 (-0500)
Subject: unicode -> str
X-Git-Tag: v3.3.1rc1~574
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aff472394cf29c7712854043fbac6a032195fe77;p=python

unicode -> str
---

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index abad2512a6..40717d8ba9 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;
         }