diff Modules/parsermodule.c @ 62654:c5afe9552779 legacy-trunk

Issue #9125: Update parser module for "except ... as ..." syntax.
author Mark Dickinson <dickinsm@gmail.com>
date Wed, 30 Jun 2010 16:27:57 +0000
parents fd25030223b0
children ecd71b6127e4
line wrap: on
line diff
--- a/Modules/parsermodule.c	Wed Jun 30 14:19:56 2010 +0000
+++ b/Modules/parsermodule.c	Wed Jun 30 16:27:57 2010 +0000
@@ -2126,10 +2126,13 @@
 
     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);
 }