mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 13:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 82400 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Mark Dickinson 2010-06-30 16:33:23 +00:00
parent 284bc0e711
commit 9f11f39758
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_parser.py
View file

@ -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.

2
Misc/NEWS
View file

@ -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).

11
Modules/parsermodule.c
View file

@ -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);
}