[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#27042)

[benjamin.peterson]

https://hg.python.org/cpython/rev/d384bf58f5f8
changeset:   101402:d384bf58f5f8
parent:      101399:f74f65e63f2f
parent:      101401:d13999a6be8c
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 16 23:20:32 2016 -0700
summary:
  merge 3.5 (#27042)

files:
  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
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -469,7 +469,7 @@
 .. 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 @@
 
 .. 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

-- 
Repository URL: https://hg.python.org/cpython