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

Merged revisions 82537 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82537 | mark.dickinson | 2010-07-04 17:37:31 +0100 (Sun, 04 Jul 2010) | 2 lines

  Issue #9128: Fix validation of class decorators in parser module.
........
This commit is contained in:
Mark Dickinson 2010-07-04 16:39:03 +00:00
parent 775695ad03
commit a441e6465a
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

@ -150,6 +150,13 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
def test_class_defs(self):
self.check_suite("class foo():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):
self.check_suite("from sys.path import *")

2
Misc/NEWS
View File

@ -75,6 +75,8 @@ C-API
Library
-------
- Issue #9128: Fix validation of class decorators in parser module.
- Issue #5468: urlencode to handle bytes type and other encodings in its query
parameter. Patch by Dan Mahn.

9
Modules/parsermodule.c
View File

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