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