| commit | acaeff8f159a452ecda6be3ec9b2aeeaedc029f3 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:54:16 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:54:16 2011 -0500 |
| tree | 4564bc9a654491e5ee7de7376395177cf577785e | |
| parent | 7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4 [diff] | |
| parent | 134a8baed9b70b2d6a953d0c872fc2c42580e1b6 [diff] |
merge heads
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1f2d919..77f8dd5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c
@@ -1897,7 +1897,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; }