merge 3.5 (#27042)

diff --cc Doc/reference/compound_stmts.rst
index 513cc15979c2464b1d10c7adef3088456c4e4e53,8047673e190f46ba728ee65697d319810de0945f..1a296923b23a7e3ea85d956819f14ad4c1631b87
--- 1/Doc/reference/compound_stmts.rst
--- 2/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`