commit aff472394cf29c7712854043fbac6a032195fe77
author Benjamin Peterson <benjamin@python.org> Sun Dec 02 10:53:41 2012 -0500
committer Benjamin Peterson <benjamin@python.org> Sun Dec 02 10:53:41 2012 -0500
tree 1817b8ab8c24a3d5f88946ed6237eaa5b0359e7c
parent 6e61d18891baf0c173464ae37464ec995889080a

unicode -> str

Modules/cjkcodecs/multibytecodec.c

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 @@
         !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 @@
         !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 @@
             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;
         }