Head merge.

This commit is contained in:
Barry Warsaw 2013-10-08 20:22:24 -04:00
commit 0e0896b582
1 changed files with 2 additions and 2 deletions

View File

@ -145,7 +145,7 @@ values. Instead, positional-only parameters can be specified
in optional "groups". Groups of parameters are surrounded by
square brackets, like so::
def addch([y, x,] ch, [attr], /):
def addch([y, x,] ch, [attr,] /):
Positional-only parameters that are not in an option group are
"required" positional-only parameters. All "required" positional-only
@ -205,7 +205,7 @@ More semantics of positional-only parameters:
It's possible to specify a function prototype where the mapping
of arguments to parameters is ambiguous. Consider::
def range([start,] stop, [range], /):
def range([start,] stop, [range,] /):
Python disambiguates these situations by preferring optional groups
to the *left* of the required group.