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.
........
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 9c73b99..3a7bbe9 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -150,6 +150,13 @@
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 *")
diff --git a/Misc/NEWS b/Misc/NEWS
index d630751..b2a3160 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,8 @@
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.
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index dce85c2..b00037d 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2507,14 +2507,15 @@
static int
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)))
- );
- return ok;
+ int nch = NCH(tree);
+ int ok = (validate_ntype(tree, decorated)
+ && (nch == 2)
+ && 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;
}
static int