[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/12cd1c8a6bb0
changeset:   80690:12cd1c8a6bb0
parent:      80688:22d891a2d533
parent:      80689:b1db531736a3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 02 10:53:48 2012 -0500
summary:
  merge 3.3

files:
  Modules/cjkcodecs/multibytecodec.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython