Merge 3.5

This commit is contained in:
Yury Selivanov 2015-09-13 01:40:46 -04:00
commit cc32fbabe2
1 changed files with 6 additions and 6 deletions

View File

@ -2102,17 +2102,17 @@ Build and C API Changes
New ``calloc`` functions were added: New ``calloc`` functions were added:
* :c:func:`PyMem_RawCalloc`, * :c:func:`PyMem_RawCalloc`,
* :c:func:`PyMem_Calloc`, * :c:func:`PyMem_Calloc`,
* :c:func:`PyObject_Calloc`, * :c:func:`PyObject_Calloc`,
* :c:func:`_PyObject_GC_Calloc`. * :c:func:`_PyObject_GC_Calloc`.
(Contributed by Victor Stinner in :issue:`21233`.) (Contributed by Victor Stinner in :issue:`21233`.)
New encoding/decoding helper functions: New encoding/decoding helper functions:
* :c:func:`Py_DecodeLocale` (replaced ``_Py_char2wchar()``), * :c:func:`Py_DecodeLocale` (replaced ``_Py_char2wchar()``),
* :c:func:`Py_EncodeLocale` (replaced ``_Py_wchar2char()``). * :c:func:`Py_EncodeLocale` (replaced ``_Py_wchar2char()``).
(Contributed by Victor Stinner in :issue:`18395`.) (Contributed by Victor Stinner in :issue:`18395`.)