pep-0492: Fixes, edits.

This commit is contained in:
Yury Selivanov 2015-04-18 10:40:37 -04:00
parent 12260a062d
commit 0222b32b38
1 changed files with 6 additions and 6 deletions

View File

@ -480,13 +480,13 @@ Glossary
Returned from a coroutine function. See `Await Expression`_ for details.
:Future-like object:
An object with an ``__await__`` method. It is consumed by ``await`` in a
coroutine. A coroutine waiting for a Future-like object is suspended until
the Future-like object's ``__await__`` completes. ``await`` returns the
result of the Future-like object. See `Await Expression`_ for details.
An object with an ``__await__`` method. Can be consumed by an ``await``
expression in a coroutine. A coroutine waiting for a Future-like object is
suspended until the Future-like object's ``__await__`` completes, and
returns the result. See `Await Expression`_ for details.
:Awaitable:
A *future-like* object or a *coroutine object*. See `Await Expression`_
A *Future-like* object or a *coroutine object*. See `Await Expression`_
for details.
:Generator-based coroutine:
@ -516,7 +516,7 @@ Method Can contain Can't contain
================= ======================================= =================
async def func await, return value yield, yield from
async def __a*__ await, return value yield, yield from
def __a*__ return Future-like await
def __a*__ return awaitable await
def __await__ yield, yield from, return iterable await
generator yield, yield from, return value await
================= ======================================= =================