mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #9128: Fix validation of class decorators in parser module.

This commit is contained in:
Mark Dickinson 2010-07-04 16:37:31 +00:00
parent 9a492acc14
commit 2bd61a988f
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_parser.py
View File

@ -149,6 +149,13 @@ def test_function_defs(self):
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 foo(object):pass") self.check_suite("class foo(object):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 *")

2
Misc/NEWS
View File

@ -468,6 +468,8 @@ C-API
Library Library
------- -------
- Issue #9128: Fix validation of class decorators in parser module.
- Issue #9094: python -m pickletools will now disassemble pickle files - Issue #9094: python -m pickletools will now disassemble pickle files
listed in the command line arguments. See output of python -m listed in the command line arguments. See output of python -m
pickletools -h for more details. pickletools -h for more details.

9
Modules/parsermodule.c
View File

@ -2512,10 +2512,11 @@ 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
ok = ok && validate_class(RCHILD(tree, -1));
return ok; return ok;
} }