summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-10-26 00:23:54 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-10-26 00:23:54 (GMT)
commit3d6948e4325fe0f142fa074377c4df08537d6a46 (patch)
treeb6e6de88967385f0d89f571c1d44f3b2d40ce094 /Doc/reference
parent9588593b791d2c0052296f3df462350280dd3747 (diff)
parent8b0f3ad9faad504d8821703646445c090d40351c (diff)
downloadcpython-3d6948e4325fe0f142fa074377c4df08537d6a46.zip
cpython-3d6948e4325fe0f142fa074377c4df08537d6a46.tar.gz
cpython-3d6948e4325fe0f142fa074377c4df08537d6a46.tar.bz2
Merge from 3.3: fix formatting of syntax description of function definition.
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/compound_stmts.rst3
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`]