mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-29951: Include function name for some error messages in PyArg_ParseTuple* (#916)

Browse source 
Also changed format specifier for function name from "%s" to "%.200s"
and exception messages should start with lowercase letter.
This commit is contained in:
Michael Seifert 2017-04-09 09:47:12 +02:00 • committed by Serhiy Storchaka
parent a2a9ddd923
commit 64c8f705c0
4 changed files with 54 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_getargs2.py
View file

@ -553,7 +553,8 @@ class Keywords_TestCase(unittest.TestCase):
try:
getargs_keywords(arg1=(1,2))
except TypeError as err:
self.assertEqual(str(err), "Required argument 'arg2' (pos 2) not found")
self.assertEqual(
str(err), "function missing required argument 'arg2' (pos 2)")
else:
self.fail('TypeError should have been raised')
@ -626,16 +627,16 @@ class KeywordOnly_TestCase(unittest.TestCase):
)
# required arg missing
with self.assertRaisesRegex(TypeError,
r"Required argument 'required' \(pos 1\) not found"):
r"function missing required argument 'required' \(pos 1\)"):
getargs_keyword_only(optional=2)
with self.assertRaisesRegex(TypeError,
r"Required argument 'required' \(pos 1\) not found"):
r"function missing required argument 'required' \(pos 1\)"):
getargs_keyword_only(keyword_only=3)
def test_too_many_args(self):
with self.assertRaisesRegex(TypeError,
r"Function takes at most 2 positional arguments \(3 given\)"):
r"function takes at most 2 positional arguments \(3 given\)"):
getargs_keyword_only(1, 2, 3)
with self.assertRaisesRegex(TypeError,
@ -674,11 +675,11 @@ class PositionalOnlyAndKeywords_TestCase(unittest.TestCase):
self.assertEqual(self.getargs(1), (1, -1, -1))
# required positional arg missing
with self.assertRaisesRegex(TypeError,
r"Function takes at least 1 positional arguments \(0 given\)"):
r"function takes at least 1 positional arguments \(0 given\)"):
self.getargs()
with self.assertRaisesRegex(TypeError,
r"Function takes at least 1 positional arguments \(0 given\)"):
r"function takes at least 1 positional arguments \(0 given\)"):
self.getargs(keyword=3)
def test_empty_keyword(self):