From eff853ccd7e647d30db712fde1b82cfba09d276a Mon Sep 17 00:00:00 2001 From: Armin Rigo Date: Wed, 29 Nov 2006 22:07:38 +0000 Subject: Backport of r52862. --- Python/ceval.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Python/ceval.c b/Python/ceval.c index b9000a6..358346c 100644 --- 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) -- cgit v0.12