summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-02-26 13:58:48 (GMT)
committerLarry Hastings <larry@hastings.org>2015-02-26 13:58:48 (GMT)
commit8c3ec536e924002dc3afe4ff92e32fe9ed82ebab (patch)
treef141eec287584ba9d58d32461e1a7d92b5466e91 /Include
parente287746401398ee81c8e8a1513a5fe828eb32559 (diff)
parent7b2c3c6840052ea6f8b41253faf38b9e24f9a453 (diff)
downloadcpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.zip
cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.gz
cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.bz2
Merge 3.4.3 release engineering changes back into 3.4.
Diffstat (limited to 'Include')
-rw-r--r--Include/unicodeobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 729f584..d7b2ace 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -1052,7 +1052,7 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
always ends with a nul character. If size is not NULL, write the number of
wide characters (excluding the null character) into *size.
- Returns a buffer allocated by PyMem_Alloc() (use PyMem_Free() to free it)
+ Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it)
on success. On error, returns NULL, *size is undefined and raises a
MemoryError. */