diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-26 00:23:14 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-26 00:23:14 (GMT) |
| commit | 8b0f3ad9faad504d8821703646445c090d40351c (patch) | |
| tree | ce7ed86c8eea0641fe967c44d00f00fcec7cc49d /Doc/reference | |
| parent | 039e0cdc28ebcea7a6364d6277f11ed330e38028 (diff) | |
| parent | c131b0760d9d9c478e3dad0240040d75793c652d (diff) | |
| download | cpython-8b0f3ad9faad504d8821703646445c090d40351c.zip cpython-8b0f3ad9faad504d8821703646445c090d40351c.tar.gz cpython-8b0f3ad9faad504d8821703646445c090d40351c.tar.bz2 | |
Merge from 3.2: fix formatting of syntax description of function definition.
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 003224b..6889176 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -442,8 +442,7 @@ A function definition defines a user-defined function object (see section decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* - : ( "*" [`parameter`] ("," `defparameter`)* - : [, "**" `parameter`] + : ( "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`] : | "**" `parameter` : | `defparameter` [","] ) parameter: `identifier` [":" `expression`] |