[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (typo)

[victor.stinner]

https://hg.python.org/cpython/rev/8f978b2891dc
changeset:   94590:8f978b2891dc
parent:      94588:c9c6b5bcdb1f
parent:      94589:368b2021c2e7
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Feb 11 18:18:10 2015 +0100
summary:
  Merge 3.4 (typo)

files:
  Include/unicodeobject.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -1052,7 +1052,7 @@
    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. */
 

-- 
Repository URL: https://hg.python.org/cpython