mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
bpo-30878: Fix error message when keyword arguments are passed (#2635)
to staticmethod() and classmethod().
This commit is contained in:
parent
aa6a4d6ed8
commit
9648088e6c
|
@ -186,6 +186,14 @@ def test_varargs11_kw(self):
|
|||
msg = r"^pack\(\) takes no keyword arguments$"
|
||||
self.assertRaisesRegex(TypeError, msg, struct.Struct.pack, struct.Struct(""), x=2)
|
||||
|
||||
def test_varargs12_kw(self):
|
||||
msg = r"^staticmethod\(\) takes no keyword arguments$"
|
||||
self.assertRaisesRegex(TypeError, msg, staticmethod, func=id)
|
||||
|
||||
def test_varargs13_kw(self):
|
||||
msg = r"^classmethod\(\) takes no keyword arguments$"
|
||||
self.assertRaisesRegex(TypeError, msg, classmethod, func=id)
|
||||
|
||||
def test_oldargs0_1(self):
|
||||
msg = r"keys\(\) takes no arguments \(1 given\)"
|
||||
self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
|
||||
|
|
|
@ -702,10 +702,10 @@ cm_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|||
classmethod *cm = (classmethod *)self;
|
||||
PyObject *callable;
|
||||
|
||||
if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable))
|
||||
return -1;
|
||||
if (!_PyArg_NoKeywords("classmethod", kwds))
|
||||
return -1;
|
||||
if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable))
|
||||
return -1;
|
||||
Py_INCREF(callable);
|
||||
cm->cm_callable = callable;
|
||||
return 0;
|
||||
|
@ -883,10 +883,10 @@ sm_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|||
staticmethod *sm = (staticmethod *)self;
|
||||
PyObject *callable;
|
||||
|
||||
if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable))
|
||||
return -1;
|
||||
if (!_PyArg_NoKeywords("staticmethod", kwds))
|
||||
return -1;
|
||||
if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable))
|
||||
return -1;
|
||||
Py_INCREF(callable);
|
||||
sm->sm_callable = callable;
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue