Issue #27358: Merge from 3.6

This commit is contained in:
Berker Peksag 2016-10-02 13:08:47 +03:00
commit 419968c235

View file

@ -2721,7 +2721,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
if (PyDict_Update(sum, arg) < 0) { if (PyDict_Update(sum, arg) < 0) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) { if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"'%.200s' object is not a mapping1", "'%.200s' object is not a mapping",
arg->ob_type->tp_name); arg->ob_type->tp_name);
} }
Py_DECREF(sum); Py_DECREF(sum);