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

Fri Sep 11 01:00:03 CEST 2015

https://hg.python.org/cpython/rev/c4b889d0bf93
changeset: 97883:c4b889d0bf93
parent: 97881:247945814be1
parent: 97882:8750ef16c75d
user: Yury Selivanov <yselivanov at sprymix.com>
date: Thu Sep 10 18:59:52 2015 -0400
summary:
 Merge 3.5
files:
 Doc/whatsnew/3.5.rst | 12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -1380,11 +1380,15 @@
 types
 -----
 
-New :func:`~types.coroutine` function. (Contributed by Yury Selivanov
-in :issue:`24017`.)
+A new :func:`~types.coroutine` function to transform
+:term:`generator <generator iterator>` and
+:class:`generator-like <collections.abc.Generator>` objects into
+:term:`awaitables <awaitable>`.
+(Contributed by Yury Selivanov in :issue:`24017`.)
 
-New :class:`~types.CoroutineType`. (Contributed by Yury Selivanov
-in :issue:`24400`.)
+A new :class:`~types.CoroutineType` is the type of :term:`coroutine` objects,
+produced by calling a function defined with an :keyword:`async def` statement.
+(Contributed by Yury Selivanov in :issue:`24400`.)
 
 
 urllib
-- 
Repository URL: https://hg.python.org/cpython
