From a441e6465a26b00730cbeae09cf89bcfba6a7c78 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 4 Jul 2010 16:39:03 +0000
Subject: [PATCH] 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.
........
---
 Lib/test/test_parser.py |  7 +++++++
 Misc/NEWS               |  2 ++
 Modules/parsermodule.c  | 17 +++++++++--------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 9c73b99d465..3a7bbe95e4e 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -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 *")
diff --git a/Misc/NEWS b/Misc/NEWS
index d630751de8d..b2a316062c9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
 
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index dce85c24ab4..b00037db53c 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2507,14 +2507,15 @@ validate_funcdef(node *tree)
 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