[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23110)

[benjamin.peterson]

https://hg.python.org/cpython/rev/edf4ea3cfe68
changeset:   93956:edf4ea3cfe68
parent:      93954:edf669b13482
parent:      93955:08972a47f710
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Dec 24 10:51:10 2014 -0600
summary:
  merge 3.4 (#23110)

files:
  Doc/c-api/init.rst |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -251,6 +251,9 @@
    Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
    :c:type:`wchar_*` string.
 
+   The path argument is copied internally, so the caller may free it after the
+   call completes.
+
 
 .. c:function:: const char* Py_GetVersion()
 

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