commit | e518d4c18a760a153fb381b38fe022b3c1b36096 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:52:19 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:52:19 2011 -0500 |
tree | c799cb6ebcd0ec62801a275291e4f8b0ca9846d0 | |
parent | 020340f2841ec2b70b9e09921850d16019d0667e [diff] | |
parent | 7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4 [diff] |
merge 3.2
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index a0bb39f..9d8fcb5 100644 --- 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 NULL character"); + PyErr_SetString(PyExc_TypeError, "embedded NUL character"); Py_DECREF(output); return 0; }