merge heads

This commit is contained in:
Benjamin Peterson 2011-07-30 22:08:18 -05:00
commit e62bada41e
1 changed files with 1 additions and 1 deletions

View File

@ -741,7 +741,7 @@ there were no excess keyword arguments.
If the syntax ``*expression`` appears in the function call, ``expression`` must
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
*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*.