Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix regression in error message introduced in bpo-29951. (#2028)

Browse source 
* Fix regression in error message introduced in bpo-29951.

* Add test.

* Make the test more strong.
This commit is contained in:
Serhiy Storchaka 2017-06-09 19:27:06 +03:00 • committed by Victor Stinner
parent 57161aac5e
commit f9f1ccace3
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_call.py
View file

@ -136,6 +136,10 @@ def test_varargs2(self):
msg = r"__contains__\(\) takes exactly one argument \(2 given\)" msg = r"__contains__\(\) takes exactly one argument \(2 given\)"
self.assertRaisesRegex(TypeError, msg, {}.__contains__, 0, 1) self.assertRaisesRegex(TypeError, msg, {}.__contains__, 0, 1)
def test_varargs3(self):
msg = r"^from_bytes\(\) takes at most 2 positional arguments \(3 given\)"
self.assertRaisesRegex(TypeError, msg, int.from_bytes, b'a', 'little', False)
def test_varargs1_kw(self): def test_varargs1_kw(self):
msg = r"__contains__\(\) takes no keyword arguments" msg = r"__contains__\(\) takes no keyword arguments"
self.assertRaisesRegex(TypeError, msg, {}.__contains__, x=2) self.assertRaisesRegex(TypeError, msg, {}.__contains__, x=2)

4
Python/getargs.c
View file

@ -2089,13 +2089,13 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
if (parser->max < nargs) { if (parser->max < nargs) {
if (parser->max == 0) { if (parser->max == 0) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%200s%s takes no positional arguments", "%.200s%s takes no positional arguments",
(parser->fname == NULL) ? "function" : parser->fname, (parser->fname == NULL) ? "function" : parser->fname,
(parser->fname == NULL) ? "" : "()"); (parser->fname == NULL) ? "" : "()");
} }
else { else {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%200s%s takes %s %d positional arguments (%d given)", "%.200s%s takes %s %d positional arguments (%d given)",
(parser->fname == NULL) ? "function" : parser->fname, (parser->fname == NULL) ? "function" : parser->fname,
(parser->fname == NULL) ? "" : "()", (parser->fname == NULL) ? "" : "()",
(parser->min != INT_MAX) ? "at most" : "exactly", (parser->min != INT_MAX) ? "at most" : "exactly",