summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_getargs2.py
diff options
context:
space:
mode:
authorMichael Seifert <michaelseifert04@yahoo.de>2017-04-09 07:47:12 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-04-09 07:47:12 (GMT)
commit64c8f705c0121a4b45ca2c3bc7b47b282e9efcd8 (patch)
tree5f58baf5aa8ab19a167688c1710016291f5758ca /Lib/test/test_getargs2.py
parenta2a9ddd923a849124bdd1c484f70f02df6fde0e9 (diff)
downloadcpython-64c8f705c0121a4b45ca2c3bc7b47b282e9efcd8.zip
cpython-64c8f705c0121a4b45ca2c3bc7b47b282e9efcd8.tar.gz
cpython-64c8f705c0121a4b45ca2c3bc7b47b282e9efcd8.tar.bz2
bpo-29951: Include function name for some error messages in `PyArg_ParseTuple*` (#916)
Also changed format specifier for function name from "%s" to "%.200s" and exception messages should start with lowercase letter.
Diffstat (limited to 'Lib/test/test_getargs2.py')
-rw-r--r--Lib/test/test_getargs2.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index e5d9aa6..86df3a4 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -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):