bpo-30978: str.format_map() now passes key lookup exceptions through. (#2790)
Previously any exception was replaced with a KeyError exception.
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 0ea5a20..e9c07a0 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -468,7 +468,7 @@
m[(0,)]
with self.assertRaisesRegex(IndexError, 'no such group'):
m[(0, 1)]
- with self.assertRaisesRegex(KeyError, 'a2'):
+ with self.assertRaisesRegex(IndexError, 'no such group'):
'a1={a2}'.format_map(m)
m = pat.match('ac')
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 506f071..341007b 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1278,6 +1278,13 @@
self.assertRaises(ValueError, '{}'.format_map, 'a')
self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1})
+ class BadMapping:
+ def __getitem__(self, key):
+ return 1/0
+ self.assertRaises(KeyError, '{a}'.format_map, {})
+ self.assertRaises(TypeError, '{a}'.format_map, [])
+ self.assertRaises(ZeroDivisionError, '{a}'.format_map, BadMapping())
+
def test_format_huge_precision(self):
format_string = ".{}f".format(sys.maxsize + 1)
with self.assertRaises(ValueError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
new file mode 100644
index 0000000..bb67a9f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst
@@ -0,0 +1,2 @@
+str.format_map() now passes key lookup exceptions through.
+Previously any exception was replaced with a KeyError exception.
diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h
index 7ac0d75..baaac81 100644
--- a/Objects/stringlib/unicode_format.h
+++ b/Objects/stringlib/unicode_format.h
@@ -410,18 +410,22 @@
if (index == -1) {
/* look up in kwargs */
PyObject *key = SubString_new_object(&first);
- if (key == NULL)
+ if (key == NULL) {
goto error;
-
- /* Use PyObject_GetItem instead of PyDict_GetItem because this
- code is no longer just used with kwargs. It might be passed
- a non-dict when called through format_map. */
- if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) {
+ }
+ if (kwargs == NULL) {
PyErr_SetObject(PyExc_KeyError, key);
Py_DECREF(key);
goto error;
}
+ /* Use PyObject_GetItem instead of PyDict_GetItem because this
+ code is no longer just used with kwargs. It might be passed
+ a non-dict when called through format_map. */
+ obj = PyObject_GetItem(kwargs, key);
Py_DECREF(key);
+ if (obj == NULL) {
+ goto error;
+ }
}
else {
/* If args is NULL, we have a format string with a positional field