Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Mark Dickinson 2010-06-30 16:27:57 +00:00
parent 2037913507
commit 070f0abc19
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_parser.py
View File

@ -235,6 +235,12 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
self.check_suite("try: pass\nexcept: pass\nelse: pass\n" self.check_suite("try: pass\nexcept: pass\nelse: pass\n"
"finally: 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): def test_position(self):
# An absolutely minimal test of position information. Better # An absolutely minimal test of position information. Better
# tests would be a big project. # tests would be a big project.

1
Misc/NEWS
View File

@ -20,6 +20,7 @@ Library
- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
on an OpenSSL structure. on an OpenSSL structure.
- Issue #9125: Add recognition of 'except ... as ...' syntax to parser module.
What's New in Python 2.7 release candidate 2? What's New in Python 2.7 release candidate 2?
============================================= =============================================

11
Modules/parsermodule.c
View File

@ -2126,10 +2126,13 @@ validate_except_clause(node *tree)
if (res && (nch > 1)) if (res && (nch > 1))
res = validate_test(CHILD(tree, 1)); res = validate_test(CHILD(tree, 1));
if (res && (nch == 4)) if (res && (nch == 4)) {
res = (validate_comma(CHILD(tree, 2)) if (TYPE(CHILD(tree, 2)) == NAME)
&& validate_test(CHILD(tree, 3))); res = validate_name(CHILD(tree, 2), "as");
else
res = validate_comma(CHILD(tree, 2));
res = res && validate_test(CHILD(tree, 3));
}
return (res); return (res);
} }