diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-12-24 02:02:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-12-24 02:02:12 (GMT) |
| commit | a883e566ac5e97eaf0b3221a54326c448697537f (patch) | |
| tree | a59ba452b4a7d352574142cfb891af126ac8b4fb /Doc/reference | |
| parent | 73fc81402bed33d10ebf0f372ab99b77b90f2c85 (diff) | |
| parent | 57f97f400bb7418d125704cafeb23262dc8adcd3 (diff) | |
| download | cpython-a883e566ac5e97eaf0b3221a54326c448697537f.zip cpython-a883e566ac5e97eaf0b3221a54326c448697537f.tar.gz cpython-a883e566ac5e97eaf0b3221a54326c448697537f.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index e7a6f18..1f036d2 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -427,7 +427,7 @@ A function definition defines a user-defined function object (see section .. productionlist:: funcdef: [`decorators`] "def" `funcname` "(" [`parameter_list`] ")" ["->" `expression`] ":" `suite` decorators: `decorator`+ - decorator: "@" `dotted_name` ["(" [`argument_list` [","]] ")"] NEWLINE + decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: (`defparameter` ",")* : ( "*" [`parameter`] ("," `defparameter`)* @@ -554,7 +554,7 @@ A class definition defines a class object (see section :ref:`types`): .. productionlist:: classdef: [`decorators`] "class" `classname` [`inheritance`] ":" `suite` - inheritance: "(" [`argument_list` [","] | `comprehension`] ")" + inheritance: "(" [`parameter_list`] ")" classname: `identifier` A class definition is an executable statement. The inheritance list usually |