Merged revisions 82400 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82400 | mark.dickinson | 2010-06-30 17:27:57 +0100 (Wed, 30 Jun 2010) | 2 lines

  Issue #9125:  Update parser module for "except ... as ..." syntax.
........

diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 23f418ee39589cb8a8b0ccbe3d1483725e560ada..ca5f43fa9a73cb0ba3aa300b2c2016304efebc40 100644 (file)
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -210,6 +210,12 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
         self.check_suite("try: pass\nexcept: pass\nelse: pass\n"
                          "finally: pass\n")
 
+    def test_except_clause(self):
+        self.check_suite("try: pass\nexcept: pass\n")
+        self.check_suite("try: pass\nexcept A: pass\n")
+        self.check_suite("try: pass\nexcept A, e: pass\n")
+        self.check_suite("try: pass\nexcept A as e: pass\n")
+
     def test_position(self):
         # An absolutely minimal test of position information.  Better
         # tests would be a big project.

diff --git a/Misc/NEWS b/Misc/NEWS
index 9bbd19f282c0dfb684be5ab1b093ef62646e2dca..bb74536df4dc972e291f140cf782c7ec5051c989 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,8 @@ C-API
 Library
 -------
 
+- Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.
+
 - Issue #9085: email package version number bumped to its correct
   value of 4.0.2 (same as it was in 2.5).
 

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 425d97f6bfadc205857e2a4a5ac2d0ed1ad019b2..365ec901df12cf8edb7a5d6e1137b5ef0cd34bfd 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2126,10 +2126,13 @@ validate_except_clause(node *tree)
 
     if (res && (nch > 1))
         res = validate_test(CHILD(tree, 1));
-    if (res && (nch == 4))
-        res = (validate_comma(CHILD(tree, 2))
-               && validate_test(CHILD(tree, 3)));
-
+    if (res && (nch == 4)) {
+        if (TYPE(CHILD(tree, 2)) == NAME)
+            res = validate_name(CHILD(tree, 2), "as");
+        else
+            res = validate_comma(CHILD(tree, 2));
+        res = res && validate_test(CHILD(tree, 3));
+    }
     return (res);
 }