Backport of r52862.

diff --git a/Python/ceval.c b/Python/ceval.c
index 73e8dee79094f61fa455175e40f684cc421c8cf1..7884051ffb6f68927f73187993caf0df5363d97e 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4046,8 +4046,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)