From: Georg Brandl <georg@python.org>
Date: Tue, 21 Feb 2006 22:13:44 +0000 (+0000)
Subject: Make staticmethod and classmethod complain about keyword args.
X-Git-Tag: v2.5a0~557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d02db4084e666b95aec7e042800319c6c77d825f;p=thirdparty%2FPython%2Fcpython.git

Make staticmethod and classmethod complain about keyword args.
---

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index fe34a11b5431..6c683499f375 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -686,6 +686,8 @@ cm_init(PyObject *self, PyObject *args, PyObject *kwds)
 
 	if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable))
 		return -1;
+	if (!_PyArg_NoKeywords("classmethod", kwds))
+		return -1;
 	if (!PyCallable_Check(callable)) {
 		PyErr_Format(PyExc_TypeError, "'%s' object is not callable",
 		     callable->ob_type->tp_name);
@@ -842,6 +844,8 @@ sm_init(PyObject *self, PyObject *args, PyObject *kwds)
 
 	if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable))
 		return -1;
+	if (!_PyArg_NoKeywords("staticmethod", kwds))
+		return -1;
 	Py_INCREF(callable);
 	sm->sm_callable = callable;
 	return 0;