[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Sat Dec 24 03:02:26 CET 2011

http://hg.python.org/cpython/rev/cd459def1446
changeset: 74149:cd459def1446
parent: 74146:38df3e657ded
parent: 74148:71ff2235bb4c
user: Benjamin Peterson <benjamin at python.org>
date: Fri Dec 23 20:02:12 2011 -0600
summary:
 merge 3.2
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
@@ -427,7 +427,7 @@
 .. productionlist::
 funcdef: [`decorators`] "def" `funcname` "(" [`parameter_list`] ")" ["->" `expression`] ":" `suite`
 decorators: `decorator`+
- decorator: "@" `dotted_name` ["(" [`argument_list` [","]] ")"] NEWLINE
+ decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE
 dotted_name: `identifier` ("." `identifier`)*
 parameter_list: (`defparameter` ",")*
 : ( "*" [`parameter`] ("," `defparameter`)*
@@ -554,7 +554,7 @@
 
 .. productionlist::
 classdef: [`decorators`] "class" `classname` [`inheritance`] ":" `suite`
- inheritance: "(" [`argument_list` [","] | `comprehension`] ")"
+ inheritance: "(" [`parameter_list`] ")"
 classname: `identifier`
 
 A class definition is an executable statement. The inheritance list usually
-- 
Repository URL: http://hg.python.org/cpython
