diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-08-18 18:52:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-08-18 18:52:19 (GMT) |
| commit | e518d4c18a760a153fb381b38fe022b3c1b36096 (patch) | |
| tree | c799cb6ebcd0ec62801a275291e4f8b0ca9846d0 /Objects/unicodeobject.c | |
| parent | 020340f2841ec2b70b9e09921850d16019d0667e (diff) | |
| parent | 7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4 (diff) | |
| download | cpython-e518d4c18a760a153fb381b38fe022b3c1b36096.zip cpython-e518d4c18a760a153fb381b38fe022b3c1b36096.tar.gz cpython-e518d4c18a760a153fb381b38fe022b3c1b36096.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) 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; } |