diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-05-17 06:20:32 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-05-17 06:20:32 (GMT) |
| commit | 815b61d4ce5a9aa2951982d81ec015b8ad6607f3 (patch) | |
| tree | 3e79cb7013cf0bf7bb46cb9231386c6866856338 /Doc/reference | |
| parent | c01d21e3aa12823a8ad8e23bb51e835091c6fc64 (diff) | |
| parent | 54044d605fee2867bbfe18610fc0b8120a4ff239 (diff) | |
| download | cpython-815b61d4ce5a9aa2951982d81ec015b8ad6607f3.zip cpython-815b61d4ce5a9aa2951982d81ec015b8ad6607f3.tar.gz cpython-815b61d4ce5a9aa2951982d81ec015b8ad6607f3.tar.bz2 | |
merge 3.5 (#27042)
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 513cc15..1a29692 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -469,7 +469,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` ["(" [`parameter_list` [","]] ")"] NEWLINE + decorator: "@" `dotted_name` ["(" [`argument_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* parameter_list: `defparameter` ("," `defparameter`)* ["," [`parameter_list_starargs`]] : | `parameter_list_starargs` @@ -604,7 +604,7 @@ A class definition defines a class object (see section :ref:`types`): .. productionlist:: classdef: [`decorators`] "class" `classname` [`inheritance`] ":" `suite` - inheritance: "(" [`parameter_list`] ")" + inheritance: "(" [`argument_list`] ")" classname: `identifier` A class definition is an executable statement. The inheritance list usually |