From: Georg Brandl Date: Fri, 2 Apr 2010 09:11:49 +0000 (+0000) Subject: #8012: clarification in generator glossary entry. X-Git-Tag: v2.7b1~148 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea2d38947461039b49ff2f04d28bf14bf92194df;p=python #8012: clarification in generator glossary entry. --- diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 22c1372147..9b12fcebb9 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -217,6 +217,8 @@ Glossary performs garbage collection via reference counting and a cyclic garbage collector that is able to detect and break reference cycles. + .. index:: single: generator + generator A function which returns an iterator. It looks like a normal function except that values are returned to the caller using a :keyword:`yield` @@ -230,7 +232,7 @@ Glossary .. index:: single: generator expression generator expression - An expression that returns a generator. It looks like a normal expression + An expression that returns an iterator. It looks like a normal expression followed by a :keyword:`for` expression defining a loop variable, range, and an optional :keyword:`if` expression. The combined expression generates values for an enclosing function::