summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-06-24 15:04:15 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-06-24 15:04:15 (GMT)
commit66f8828bfce4a05cb5e27ed89bba46cdfc64f995 (patch)
tree1ad1dac376e1af397092b1acd5cd0f82732d31d0 /Doc/glossary.rst
parentfcba97242b5ff446849e704926f51ce61355ee0b (diff)
downloadcpython-66f8828bfce4a05cb5e27ed89bba46cdfc64f995.zip
cpython-66f8828bfce4a05cb5e27ed89bba46cdfc64f995.tar.gz
cpython-66f8828bfce4a05cb5e27ed89bba46cdfc64f995.tar.bz2
Issue #24439: Improve PEP 492 related docs.
Patch by Martin Panter.
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst21
1 files changed, 11 insertions, 10 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index bdbb272..d00185e 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -169,18 +169,19 @@ Glossary
statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
See :pep:`343`.
- coroutine function
- A function which returns a :term:`coroutine` object. It is defined
- with an :keyword:`async def` keyword, and may contain :keyword:`await`,
- :keyword:`async for`, and :keyword:`async with` keywords. Introduced
- by :pep:`492`.
-
coroutine
Coroutines is a more generalized form of subroutines. Subroutines are
- entered at one point and exited at another point. Coroutines, can be
- entered, exited, and resumed at many different points. See
- :keyword:`await` expressions, and :keyword:`async for` and
- :keyword:`async with` statements. See also :pep:`492`.
+ entered at one point and exited at another point. Coroutines can be
+ entered, exited, and resumed at many different points. They can be
+ implemented with the :keyword:`async def` statement. See also
+ :pep:`492`.
+
+ coroutine function
+ A function which returns a :term:`coroutine` object. A coroutine
+ function may be defined with the :keyword:`async def` statement,
+ and may contain :keyword:`await`, :keyword:`async for`, and
+ :keyword:`async with` keywords. These were introduced
+ by :pep:`492`.
CPython
The canonical implementation of the Python programming language, as