[Python-checkins] python/dist/src/Doc/ref ref5.tex, 1.76.10.3, 1.76.10.4 ref7.tex, 1.35.16.2, 1.35.16.3

fdrake at users.sourceforge.net fdrake at users.sourceforge.net
Tue Nov 2 19:59:21 CET 2004


Update of /cvsroot/python/python/dist/src/Doc/ref
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6026/ref

Modified Files:
      Tag: release23-maint
	ref5.tex ref7.tex 
Log Message:
clarify trailing comma in function argument list
(SF bug #798652)


Index: ref5.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref5.tex,v
retrieving revision 1.76.10.3
retrieving revision 1.76.10.4
diff -u -d -r1.76.10.3 -r1.76.10.4
--- ref5.tex	23 Apr 2004 17:14:35 -0000	1.76.10.3
+++ ref5.tex	2 Nov 2004 18:59:18 -0000	1.76.10.4
@@ -444,8 +444,8 @@
              {\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

Index: ref7.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref7.tex,v
retrieving revision 1.35.16.2
retrieving revision 1.35.16.3
diff -u -d -r1.35.16.2 -r1.35.16.3
--- ref7.tex	2 Jun 2004 13:00:32 -0000	1.35.16.2
+++ ref7.tex	2 Nov 2004 18:59:18 -0000	1.35.16.3
@@ -318,10 +318,10 @@
              {"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}



More information about the Python-checkins mailing list