diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-08-18 15:49:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-08-18 15:49:16 (GMT) |
| commit | 020340f2841ec2b70b9e09921850d16019d0667e (patch) | |
| tree | f8ba309c529f9fd83894e71e50d6759bbfe674fa | |
| parent | 9c3de4a88357cef2753d30c816a238bd74f39273 (diff) | |
| parent | 5ad517a7d9c2694e726b3244505af274f91fb5d9 (diff) | |
| download | cpython-020340f2841ec2b70b9e09921850d16019d0667e.zip cpython-020340f2841ec2b70b9e09921850d16019d0667e.tar.gz cpython-020340f2841ec2b70b9e09921850d16019d0667e.tar.bz2 | |
merge 3.2
| -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 9d8fcb5..a0bb39f 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 NUL character"); + PyErr_SetString(PyExc_TypeError, "embedded NULL character"); Py_DECREF(output); return 0; } |