Backport of r52862.

diff --git a/Python/ceval.c b/Python/ceval.c
index b9000a652c46cd81148a5f00861e49fd5cea7acc..358346c968418218e36cf7c94d134cc30b554869 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4073,8 +4073,10 @@ import_all_from(PyObject *locals, PyObject *v)
                value = PyObject_GetAttr(v, name);
                if (value == NULL)
                        err = -1;
-               else
+               else if (PyDict_CheckExact(locals))
                        err = PyDict_SetItem(locals, name, value);
+               else
+                       err = PyObject_SetItem(locals, name, value);
                Py_DECREF(name);
                Py_XDECREF(value);
                if (err != 0)