mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

gh-107944: Improve error message for getargs with bad keyword arguments (#114792)

Browse source
This commit is contained in:
Shantanu 2024-02-08 01:04:41 -08:00 • committed by GitHub
parent 9e90313320
commit 17689e3c41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 113 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Lib/test/test_call.py
View file

@ -155,7 +155,7 @@ class CFunctionCallsErrorMessages(unittest.TestCase):
min, 0, default=1, key=2, foo=3)
def test_varargs17_kw(self):
msg = r"'foo' is an invalid keyword argument for print\(\)$"
msg = r"print\(\) got an unexpected keyword argument 'foo'$"
self.assertRaisesRegex(TypeError, msg,
print, 0, sep=1, end=2, file=3, flush=4, foo=5)
@ -928,7 +928,7 @@ class TestErrorMessagesSuggestions(unittest.TestCase):
self.assertIn(f"Did you mean '{message}'?", str(cm.exception))
@contextlib.contextmanager
def check_suggestion_not_pressent(self):
def check_suggestion_not_present(self):
with self.assertRaises(TypeError) as cm:
yield
self.assertNotIn("Did you mean", str(cm.exception))
@ -946,7 +946,7 @@ class TestErrorMessagesSuggestions(unittest.TestCase):
for keyword, suggestion in cases:
with self.subTest(keyword):
ctx = self.check_suggestion_includes(suggestion) if suggestion else self.check_suggestion_not_pressent()
ctx = self.check_suggestion_includes(suggestion) if suggestion else self.check_suggestion_not_present()
with ctx:
foo(**{keyword:None})
@ -987,6 +987,32 @@ class TestErrorMessagesSuggestions(unittest.TestCase):
with self.check_suggestion_includes(suggestion):
func(bluch=None)
def test_unexpected_keyword_suggestion_via_getargs(self):
with self.check_suggestion_includes("maxsplit"):
"foo".split(maxsplt=1)
self.assertRaisesRegex(
TypeError, r"split\(\) got an unexpected keyword argument 'blech'$",
"foo".split, blech=1
)
with self.check_suggestion_not_present():
"foo".split(blech=1)
with self.check_suggestion_not_present():
"foo".split(more_noise=1, maxsplt=1)
# Also test the vgetargskeywords path
with self.check_suggestion_includes("name"):
ImportError(namez="oops")
self.assertRaisesRegex(
TypeError, r"ImportError\(\) got an unexpected keyword argument 'blech'$",
ImportError, blech=1
)
with self.check_suggestion_not_present():
ImportError(blech=1)
with self.check_suggestion_not_present():
ImportError(blech=1, namez="oops")
@cpython_only
class TestRecursion(unittest.TestCase):