[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6 (issue #28635)

[yury.selivanov]

https://hg.python.org/cpython/rev/5c4ce500dd35
changeset:   105040:5c4ce500dd35
parent:      105038:84b4ac243508
parent:      105039:bcd4ab982429
user:        Yury Selivanov <yury at magic.io>
date:        Thu Nov 10 13:26:06 2016 -0500
summary:
  Merge 3.6 (issue #28635)

files:
  Doc/c-api/exceptions.rst |  2 +-
  Doc/library/struct.rst   |  4 ++++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -311,7 +311,7 @@
    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)
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -232,6 +232,10 @@
 .. versionchanged:: 3.3
    Added support for the ``'n'`` and ``'N'`` formats.
 
+.. versionchanged:: 3.6
+   Added support for the ``'e'`` format.
+
+
 Notes:
 
 (1)

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