From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 24 Dec 2014 16:51:10 +0000 (-0600)
Subject: merge 3.4 (#23110)
X-Git-Tag: v3.5.0a1~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a120ecdf4aedd6a8514edab01ff8de3930c977b;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23110)
---

7a120ecdf4aedd6a8514edab01ff8de3930c977b
diff --cc Doc/c-api/init.rst
index eda21414b8ab,eb542de4d8b0..5caa81ee247e
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@@ -248,9 -245,9 +248,12 @@@ Process-wide parameter
     :data:`sys.exec_prefix` to be empty.  It is up to the caller to modify these
     if required after calling :c:func:`Py_Initialize`.
  
 +   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()