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

[benjamin.peterson]

http://hg.python.org/cpython/rev/53ceb549c458
changeset:   71901:53ceb549c458
parent:      71897:50f1922bc1d5
parent:      71900:459e2a9b7f54
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Aug 18 10:49:16 2011 -0500
summary:
  merge 3.2

files:
  Objects/unicodeobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1922,7 +1922,7 @@
     size = PyBytes_GET_SIZE(output);
     data = PyBytes_AS_STRING(output);
     if (size != strlen(data)) {
-        PyErr_SetString(PyExc_TypeError, "embedded NUL character");
+        PyErr_SetString(PyExc_TypeError, "embedded NULL character");
         Py_DECREF(output);
         return 0;
     }

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