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

Issue #9128: Validate class decorator syntax correctly in parser module.

Browse source
This commit is contained in:
Mark Dickinson 2010-07-04 16:23:54 +00:00
parent 96c4df4532
commit a7ee59b3d3
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_parser.py
View file

@ -180,6 +180,14 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
def test_class_defs(self): def test_class_defs(self):
self.check_suite("class foo():pass") self.check_suite("class foo():pass")
self.check_suite("@class_decorator\n"
"class foo():pass")
self.check_suite("@class_decorator(arg)\n"
"class foo():pass")
self.check_suite("@decorator1\n"
"@decorator2\n"
"class foo():pass")
def test_import_from_statement(self): def test_import_from_statement(self):
self.check_suite("from sys.path import *") self.check_suite("from sys.path import *")

1
Misc/NEWS
View file

@ -16,6 +16,7 @@ Core and Builtins
Library Library
------- -------
- Issue #9128: Fix validation of class decorators in parser module.
Extension Modules Extension Modules
----------------- -----------------

17
Modules/parsermodule.c
View file

@ -2682,14 +2682,15 @@ validate_funcdef(node *tree)
static int static int
validate_decorated(node *tree) validate_decorated(node *tree)
{ {
int nch = NCH(tree); int nch = NCH(tree);
int ok = (validate_ntype(tree, decorated) int ok = (validate_ntype(tree, decorated)
&& (nch == 2) && (nch == 2)
&& validate_decorators(RCHILD(tree, -2)) && validate_decorators(RCHILD(tree, -2)));
&& (validate_funcdef(RCHILD(tree, -1)) if (TYPE(RCHILD(tree, -1)) == funcdef)
|| validate_class(RCHILD(tree, -1))) ok = ok && validate_funcdef(RCHILD(tree, -1));
); else
return ok; ok = ok && validate_class(RCHILD(tree, -1));
return ok;
} }
static int static int