summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-02-11 17:18:10 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-02-11 17:18:10 (GMT)
commitce2c584ea55e001a9ea2228d62fb525c24aadf04 (patch)
tree565321a5891205b2c1d1d4f9222fab695216b425
parentc07422c119ab1f53fbaec489872af7e89d6dde4f (diff)
parent22fabe218d3d6d0198075bcd8d1e1ddf821102c1 (diff)
downloadcpython-ce2c584ea55e001a9ea2228d62fb525c24aadf04.zip
cpython-ce2c584ea55e001a9ea2228d62fb525c24aadf04.tar.gz
cpython-ce2c584ea55e001a9ea2228d62fb525c24aadf04.tar.bz2
Merge 3.4 (typo)
-rw-r--r--Include/unicodeobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index d2ffabe..814d7c0 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. */