[Python-checkins] cpython (merge 3.3 -> default): MERGE: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c

[jesus.cea]

http://hg.python.org/cpython/rev/366c19bb5ca2
changeset:   79453:366c19bb5ca2
parent:      79448:cd026866b333
parent:      79452:0fc259ac8733
user:        Jesus Cea <jcea at jcea.es>
date:        Thu Oct 04 16:07:03 2012 +0200
summary:
  MERGE: Closes #16126: PyErr_Format format mismatch in _testcapimodule.c

files:
  Lib/test/test_capi.py     |  11 +++++++++++
  Misc/NEWS                 |   3 +++
  Modules/_testcapimodule.c |   2 +-
  3 files changed, 15 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -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)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
 
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -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]);

-- 
Repository URL: http://hg.python.org/cpython