summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-10-16 21:44:19 (GMT)
committerGeorg Brandl <georg@python.org>2008-10-16 21:44:19 (GMT)
commitfb362c33ffa9756df12a2de5bb743f2fa9fddfb6 (patch)
tree30dfe0566a994074f9e5c8e8d7887db3a6a11e22 /Doc/reference
parent352ebae87efdd8dead814dfc7b153dabb26317d8 (diff)
downloadcpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.zip
cpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.tar.gz
cpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.tar.bz2
Merged revisions 66928,66936,66939-66940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66928 | georg.brandl | 2008-10-16 20:20:56 +0000 (Thu, 16 Oct 2008) | 2 lines Add more TOC to the whatsnew index page. ........ r66936 | georg.brandl | 2008-10-16 21:20:15 +0000 (Thu, 16 Oct 2008) | 2 lines #4131: FF3 doesn't write cookies.txt files. ........ r66939 | georg.brandl | 2008-10-16 21:36:39 +0000 (Thu, 16 Oct 2008) | 2 lines part of #4012: kill off old name "processing". ........ r66940 | georg.brandl | 2008-10-16 21:38:48 +0000 (Thu, 16 Oct 2008) | 2 lines #4083: add "as" to except handler grammar as per PEP 3110. ........
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/compound_stmts.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 0794755..408298d 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -221,7 +221,7 @@ for a group of statements:
.. productionlist::
try_stmt: try1_stmt | try2_stmt
try1_stmt: "try" ":" `suite`
- : ("except" [`expression` ["," `target`]] ":" `suite`)+
+ : ("except" [`expression` [("as" | ",") `target`]] ":" `suite`)+
: ["else" ":" `suite`]
: ["finally" ":" `suite`]
try2_stmt: "try" ":" `suite`