cpython (merge 2.7 -> 2.7): merge heads
![](https://secure.gravatar.com/avatar/8ac615df352a970211b0e3d94a307c6d.jpg?s=120&d=mm&r=g)
http://hg.python.org/cpython/rev/ff9d5e6dfdb8 changeset: 71649:ff9d5e6dfdb8 branch: 2.7 parent: 71648:ac2a695ff888 parent: 71643:952e83a8bc78 user: Benjamin Peterson <benjamin@python.org> date: Sat Jul 30 22:08:18 2011 -0500 summary: merge heads files: Doc/reference/expressions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -741,7 +741,7 @@ 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*. -- Repository URL: http://hg.python.org/cpython
participants (1)
-
benjamin.peterson