Mercurial > cpython-lru_cache-weakref
changeset 79453:366c19bb5ca2
MERGE: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c
| author | Jesus Cea <jcea@jcea.es> |
|---|---|
| date | Thu, 04 Oct 2012 16:07:03 +0200 |
| parents | cd026866b333 (current diff) 0fc259ac8733 (diff) |
| children | 748fe6a84525 |
| files | Misc/NEWS |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/test/test_capi.py Thu Oct 04 13:58:22 2012 +0200 +++ b/Lib/test/test_capi.py Thu Oct 04 16:07:03 2012 +0200 @@ -316,6 +316,17 @@ c, i, when_skipped, when_not_skipped)) self.assertIs(when_skipped, when_not_skipped, message) + def test_parse_tuple_and_keywords(self): + # parse_tuple_and_keywords error handling tests + self.assertRaises(TypeError, _testcapi.parse_tuple_and_keywords, + (), {}, 42, []) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [''] * 42) + self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, + (), {}, b'', [42]) + def test_main(): support.run_unittest(CAPITest, TestPendingCalls, Test6012, EmbeddingTest, SkipitemTest)
--- a/Misc/NEWS Thu Oct 04 13:58:22 2012 +0200 +++ b/Misc/NEWS Thu Oct 04 16:07:03 2012 +0200 @@ -83,6 +83,9 @@ `io.BytesIO` and `io.StringIO` objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. +- Issue #16126: PyErr_Format format mismatch in _testcapimodule.c. + Patch by Serhiy Storchaka. + - Issue #15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening `os.devnull` explicitly and leaving it open.
--- a/Modules/_testcapimodule.c Thu Oct 04 13:58:22 2012 +0200 +++ b/Modules/_testcapimodule.c Thu Oct 04 16:07:03 2012 +0200 @@ -1238,7 +1238,7 @@ o = PySequence_Fast_GET_ITEM(sub_keywords, i); if (!PyUnicode_FSConverter(o, (void *)(converted + i))) { PyErr_Format(PyExc_ValueError, - "parse_tuple_and_keywords: could not convert keywords[%s] to narrow string", i); + "parse_tuple_and_keywords: could not convert keywords[%zd] to narrow string", i); goto exit; } keywords[i] = PyBytes_AS_STRING(converted[i]);