[Python-checkins] cpython (merge 3.6 -> default): Merge from 3.6.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/eb1aa6f8701e
changeset:   105823:eb1aa6f8701e
parent:      105820:93d8cce449eb
parent:      105822:02acb2f9c908
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Dec 25 16:24:15 2016 +0200
summary:
  Merge from 3.6.

files:
  Doc/c-api/exceptions.rst |  2 +-
  1 files changed, 1 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
@@ -396,7 +396,7 @@
       by code that needs to save and restore the error indicator temporarily, e.g.::
 
          {
-            PyObject **type, **value, **traceback;
+            PyObject *type, *value, *traceback;
             PyErr_Fetch(&type, &value, &traceback);
 
             /* ... code that might produce other errors ... */

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