merge 3.2

This commit is contained in:
Benjamin Peterson 2011-08-18 10:49:16 -05:00
commit 020340f284
1 changed files with 1 additions and 1 deletions

View File

@ -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 NUL character");
PyErr_SetString(PyExc_TypeError, "embedded NULL character");
Py_DECREF(output);
return 0;
}