From: Fred Drake <fdrake@acm.org>
Date: Tue, 2 Nov 2004 18:59:18 +0000 (+0000)
Subject: clarify trailing comma in function argument list
X-Git-Tag: v2.3.5c1~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1938069b13eb4c50bacdb381506b92c94b9b352;p=thirdparty%2FPython%2Fcpython.git

clarify trailing comma in function argument list
(SF bug #798652)
---

diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 804498b1f325..9fdd4ff509b1 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -444,8 +444,8 @@ series of arguments:
              {\token{identifier} "=" \token{expression}}
 \end{productionlist}
 
-A trailing comma may be present after an argument list but does not
-affect the semantics.
+A trailing comma may be present after the positional and keyword
+arguments but does not affect the semantics.
 
 The primary must evaluate to a callable object (user-defined
 functions, built-in functions, methods of built-in objects, class
diff --git a/Doc/ref/ref7.tex b/Doc/ref/ref7.tex
index 1c6d3691a918..44a58c86dfdd 100644
--- a/Doc/ref/ref7.tex
+++ b/Doc/ref/ref7.tex
@@ -318,10 +318,10 @@ section~\ref{types}):
              {"def" \token{funcname} "(" [\token{parameter_list}] ")"
               ":" \token{suite}}
   \production{parameter_list}
-             {(\token{defparameter} ",")*}
-  \productioncont{("*" \token{identifier} [, "**" \token{identifier}]}
-  \productioncont{| "**" \token{identifier}
-                  | \token{defparameter} [","])}
+                 {(\token{defparameter} ",")*}
+  \productioncont{(~~"*" \token{identifier} [, "**" \token{identifier}]}
+  \productioncont{ | "**" \token{identifier}}
+  \productioncont{ | \token{defparameter} [","] )}
   \production{defparameter}
              {\token{parameter} ["=" \token{expression}]}
   \production{sublist}