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

[yury.selivanov]

https://hg.python.org/cpython/rev/0790c2e00eca
changeset:   97969:0790c2e00eca
parent:      97967:e788c1141c09
parent:      97968:adc30928b25b
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Sun Sep 13 01:40:46 2015 -0400
summary:
  Merge 3.5

files:
  Doc/whatsnew/3.5.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -2102,17 +2102,17 @@
 
 New ``calloc`` functions were added:
 
-  * :c:func:`PyMem_RawCalloc`,
-  * :c:func:`PyMem_Calloc`,
-  * :c:func:`PyObject_Calloc`,
-  * :c:func:`_PyObject_GC_Calloc`.
+* :c:func:`PyMem_RawCalloc`,
+* :c:func:`PyMem_Calloc`,
+* :c:func:`PyObject_Calloc`,
+* :c:func:`_PyObject_GC_Calloc`.
 
 (Contributed by Victor Stinner in :issue:`21233`.)
 
 New encoding/decoding helper functions:
 
-  * :c:func:`Py_DecodeLocale` (replaced ``_Py_char2wchar()``),
-  * :c:func:`Py_EncodeLocale` (replaced ``_Py_wchar2char()``).
+* :c:func:`Py_DecodeLocale` (replaced ``_Py_char2wchar()``),
+* :c:func:`Py_EncodeLocale` (replaced ``_Py_wchar2char()``).
 
 (Contributed by Victor Stinner in :issue:`18395`.)
 

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