mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-30878: Fix error message when keyword arguments are passed (#2635)

Browse source 
to staticmethod() and classmethod().
This commit is contained in:
Sylvain 2017-07-09 05:45:06 +02:00 • committed by Serhiy Storchaka
parent aa6a4d6ed8
commit 9648088e6c
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_call.py
View file

@ -186,6 +186,14 @@ class CFunctionCallsErrorMessages(unittest.TestCase):
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)

8
Objects/funcobject.c
View file

@ -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;