mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge 3.6 (issue #28635)

Browse source
This commit is contained in:
Yury Selivanov 2016-11-10 13:26:06 -05:00
commit 69e0323ff2
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/c-api/exceptions.rst
View file

@ -311,7 +311,7 @@ an error value).
Much like :c:func:`PyErr_SetImportError` but this function allows for
specifying a subclass of :exc:`ImportError` to raise.
.. versionadded:: 3.4
.. versionadded:: 3.6
.. c:function:: int PyErr_WarnExplicitObject(PyObject *category, PyObject *message, PyObject *filename, int lineno, PyObject *module, PyObject *registry)

4
Doc/library/struct.rst
View file

@ -232,6 +232,10 @@ platform-dependent.
.. versionchanged:: 3.3
Added support for the ``'n'`` and ``'N'`` formats.
.. versionchanged:: 3.6
Added support for the ``'e'`` format.
Notes:
(1)