mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-31229: Fixed wrong error messages when too many keyword arguments are received. (#3180)

Browse source
This commit is contained in:
Oren Milman 2017-08-23 21:16:48 +03:00 • committed by Serhiy Storchaka
parent 772d809a63
commit bf9075a0c5
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/test/test_call.py
View file

@ -7,6 +7,7 @@ except ImportError:
_testcapi = None _testcapi = None
import struct import struct
import collections import collections
import itertools
# The test cases here cover several paths through the function calling # The test cases here cover several paths through the function calling
# code. They depend on the METH_XXX flag that is used to define a C # code. They depend on the METH_XXX flag that is used to define a C
@ -194,6 +195,26 @@ class CFunctionCallsErrorMessages(unittest.TestCase):
msg = r"^classmethod\(\) takes no keyword arguments$" msg = r"^classmethod\(\) takes no keyword arguments$"
self.assertRaisesRegex(TypeError, msg, classmethod, func=id) self.assertRaisesRegex(TypeError, msg, classmethod, func=id)
def test_varargs14_kw(self):
msg = r"^product\(\) takes at most 1 keyword argument \(2 given\)$"
self.assertRaisesRegex(TypeError, msg,
itertools.product, 0, repeat=1, foo=2)
def test_varargs15_kw(self):
msg = r"^ImportError\(\) takes at most 2 keyword arguments \(3 given\)$"
self.assertRaisesRegex(TypeError, msg,
ImportError, 0, name=1, path=2, foo=3)
def test_varargs16_kw(self):
msg = r"^min\(\) takes at most 2 keyword arguments \(3 given\)$"
self.assertRaisesRegex(TypeError, msg,
min, 0, default=1, key=2, foo=3)
def test_varargs17_kw(self):
msg = r"^print\(\) takes at most 4 keyword arguments \(5 given\)$"
self.assertRaisesRegex(TypeError, msg,
print, 0, sep=1, end=2, file=3, flush=4, foo=5)
def test_oldargs0_1(self): def test_oldargs0_1(self):
msg = r"keys\(\) takes no arguments \(1 given\)" msg = r"keys\(\) takes no arguments \(1 given\)"
self.assertRaisesRegex(TypeError, msg, {}.keys, 0) self.assertRaisesRegex(TypeError, msg, {}.keys, 0)

10
Python/getargs.c
View file

@ -1654,11 +1654,14 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
nargs = PyTuple_GET_SIZE(args); nargs = PyTuple_GET_SIZE(args);
nkwargs = (kwargs == NULL) ? 0 : PyDict_GET_SIZE(kwargs); nkwargs = (kwargs == NULL) ? 0 : PyDict_GET_SIZE(kwargs);
if (nargs + nkwargs > len) { if (nargs + nkwargs > len) {
/* Adding "keyword" (when nargs == 0) prevents producing wrong error
messages in some special cases (see bpo-31229). */
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%.200s%s takes at most %d argument%s (%zd given)", "%.200s%s takes at most %d %sargument%s (%zd given)",
(fname == NULL) ? "function" : fname, (fname == NULL) ? "function" : fname,
(fname == NULL) ? "" : "()", (fname == NULL) ? "" : "()",
len, len,
(nargs == 0) ? "keyword " : "",
(len == 1) ? "" : "s", (len == 1) ? "" : "s",
nargs + nkwargs); nargs + nkwargs);
return cleanreturn(0, &freelist); return cleanreturn(0, &freelist);
@ -2077,11 +2080,14 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
nkwargs = 0; nkwargs = 0;
} }
if (nargs + nkwargs > len) { if (nargs + nkwargs > len) {
/* Adding "keyword" (when nargs == 0) prevents producing wrong error
messages in some special cases (see bpo-31229). */
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%.200s%s takes at most %d argument%s (%zd given)", "%.200s%s takes at most %d %sargument%s (%zd given)",
(parser->fname == NULL) ? "function" : parser->fname, (parser->fname == NULL) ? "function" : parser->fname,
(parser->fname == NULL) ? "" : "()", (parser->fname == NULL) ? "" : "()",
len, len,
(nargs == 0) ? "keyword " : "",
(len == 1) ? "" : "s", (len == 1) ? "" : "s",
nargs + nkwargs); nargs + nkwargs);
return cleanreturn(0, &freelist); return cleanreturn(0, &freelist);