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

[yury.selivanov]

https://hg.python.org/cpython/rev/34a315e05c57
changeset:   96646:34a315e05c57
parent:      96643:b1fac7685947
parent:      96645:58ded1d9a3c1
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Tue Jun 23 11:46:26 2015 -0400
summary:
  Merge 3.5

files:
  Doc/c-api/typeobj.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -220,7 +220,7 @@
    the subtype's :c:member:`~PyTypeObject.tp_setattr` and :c:member:`~PyTypeObject.tp_setattro` are both *NULL*.
 
 
-.. c:member:: void* PyTypeObject.tp_as_async
+.. c:member:: PyAsyncMethods* tp_as_async
 
    Pointer to an additional structure that contains fields relevant only to
    objects which implement :term:`awaitable` and :term:`asynchronous iterator`

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