[Python-checkins] peps: pep-492: Fix markup of Glossary section; clarify abc.Coroutine

[yury.selivanov]

https://hg.python.org/peps/rev/51169e28a7c6
changeset:   5892:51169e28a7c6
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Jun 03 00:16:19 2015 -0400
summary:
  pep-492: Fix markup of Glossary section; clarify abc.Coroutine

files:
  pep-0492.txt |  26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/pep-0492.txt b/pep-0492.txt
--- a/pep-0492.txt
+++ b/pep-0492.txt
@@ -712,8 +712,8 @@
   implement ``__await__`` method.
 
 * ``collections.abc.Coroutine`` ABC for *coroutine* objects, that
-  implement ``send(value)``, ``throw(type, exc, tb)``, and ``close()``
-  methods.
+  implement ``send(value)``, ``throw(type, exc, tb)``, ``close()`` and
+  ``__await__()`` methods.
 
 To allow easy testing if objects support asynchronous iteration, two
 more ABCs are added:
@@ -727,30 +727,30 @@
 Glossary
 ========
 
-:Native coroutine function:
+Native coroutine function
     A coroutine function is declared with ``async def``. It uses
     ``await`` and ``return value``; see `New Coroutine Declaration
     Syntax`_ for details.
 
-:Native coroutine:
+Native coroutine
     Returned from a native coroutine function. See `Await Expression`_
     for details.
 
-:Generator-based coroutine function:
+Generator-based coroutine function
     Coroutines based on generator syntax.  Most common example are
     functions decorated with ``@asyncio.coroutine``.
 
-:Generator-based coroutine:
+Generator-based coroutine
     Returned from a generator-based coroutine function.
 
-:Coroutine:
+Coroutine
     Either *native coroutine* or *generator-based coroutine*.
 
-:Coroutine object:
+Coroutine object
     Either *native coroutine* object or *generator-based coroutine*
     object.
 
-:Future-like object:
+Future-like object
     An object with an ``__await__`` method, or a C object with
     ``tp_as_async->am_await`` function, returning an *iterator*.  Can be
     consumed by an ``await`` expression in a coroutine. A coroutine
@@ -758,21 +758,21 @@
     object's ``__await__`` completes, and returns the result.  See
     `Await Expression`_ for details.
 
-:Awaitable:
+Awaitable
     A *Future-like* object or a *coroutine* object.  See `Await
     Expression`_ for details.
 
-:Asynchronous context manager:
+Asynchronous context manager
    An asynchronous context manager has ``__aenter__`` and ``__aexit__``
    methods and can be used with ``async with``.  See `Asynchronous
    Context Managers and "async with"`_ for details.
 
-:Asynchronous iterable:
+Asynchronous iterable
     An object with an ``__aiter__`` method, which must return an
     *asynchronous iterator* object.  Can be used with ``async for``.
     See `Asynchronous Iterators and "async for"`_ for details.
 
-:Asynchronous iterator:
+Asynchronous iterator
     An asynchronous iterator has an ``__anext__`` method.  See
     `Asynchronous Iterators and "async for"`_ for details.
 

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