From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 29 Jul 2011 11:45:08 +0000 (+0300)
Subject: Issue #12531: add index entries to documentation of * and ** in function calls
X-Git-Tag: v2.7.3rc1~565
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cdf383cee1d643ffc3140119debf476f931c5d8;p=thirdparty%2FPython%2Fcpython.git

Issue #12531: add index entries to documentation of * and ** in function calls
---

diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 067a3d68e212..b54bfd0daf2e 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -735,12 +735,15 @@ dictionary containing the excess keyword arguments (using the keywords as keys
 and the argument values as corresponding values), or a (new) empty dictionary if
 there were no excess keyword arguments.
 
+.. index::
+   single: *; in function calls
+
 If the syntax ``*expression`` appears in the function call, ``expression`` must
-evaluate to a sequence.  Elements from this sequence are treated as if they were
-additional positional arguments; if there are positional arguments *x1*,...,
-*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, this is
-equivalent to a call with M+N positional arguments *x1*, ..., *xN*, *y1*, ...,
-*yM*.
+evaluate to an iterable.  Elements from this iterable are treated as if they
+were additional positional arguments; if there are positional arguments
+*x1*,...,*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, this
+is equivalent to a call with M+N positional arguments *x1*, ..., *xN*, *y1*,
+..., *yM*.
 
 A consequence of this is that although the ``*expression`` syntax may appear
 *after* some keyword arguments, it is processed *before* the keyword arguments
@@ -761,6 +764,9 @@ A consequence of this is that although the ``*expression`` syntax may appear
 It is unusual for both keyword arguments and the ``*expression`` syntax to be
 used in the same call, so in practice this confusion does not arise.
 
+.. index::
+   single: **; in function calls
+
 If the syntax ``**expression`` appears in the function call, ``expression`` must
 evaluate to a mapping, the contents of which are treated as additional keyword
 arguments.  In the case of a keyword appearing in both ``expression`` and as an