diff options
| author | Yury Selivanov <yury@magic.io> | 2016-11-10 13:26:06 -0500 |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-11-10 13:26:06 -0500 |
| commit | 69e0323ff2cf4ffff033e2c84bb056aac58fa81c (patch) | |
| tree | 9eea4cae90a89fef3cc906b61c77e39d2d90cd11 | |
| parent | 11ca7b5b8f6449137c90ea9c3e905378366aec58 (diff) | |
| parent | 3479b5f888136f0f7a8cfefec074d8fa47aab39d (diff) | |
| download | cpython-git-69e0323ff2cf4ffff033e2c84bb056aac58fa81c.tar.gz | |
Merge 3.6 (issue #28635)
| -rw-r--r-- | Doc/c-api/exceptions.rst | 2 | ||||
| -rw-r--r-- | 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 index 25fb29c48c..ee51791a90 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -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) diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst index 7e861fdeaf..cc3017b5fc 100644 --- a/Doc/library/struct.rst +++ b/Doc/library/struct.rst @@ -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) |