From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 May 2016 06:20:32 +0000 (-0700)
Subject: merge 3.5 (#27042)
X-Git-Tag: v3.6.0a2~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=815b61d4ce5a9aa2951982d81ec015b8ad6607f3;p=python

merge 3.5 (#27042)
---

815b61d4ce5a9aa2951982d81ec015b8ad6607f3
diff --cc Doc/reference/compound_stmts.rst
index 513cc15979,8047673e19..1a296923b2
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@@ -469,12 -469,12 +469,12 @@@ A function definition defines a user-de
  .. 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` ",")*
 -                 : | "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`]
 -                 : | "**" `parameter`
 -                 : | `defparameter` [","] )
 +   parameter_list: `defparameter` ("," `defparameter`)* ["," [`parameter_list_starargs`]]
 +                 : | `parameter_list_starargs`
 +   parameter_list_starargs: "*" [`parameter`] ("," `defparameter`)* ["," ["**" `parameter` [","]]]
 +                         : | "**" `parameter` [","]
     parameter: `identifier` [":" `expression`]
     defparameter: `parameter` ["=" `expression`]
     funcname: `identifier`