From: Armin Rigo <arigo@tunes.org>
Date: Wed, 29 Nov 2006 22:07:38 +0000 (+0000)
Subject: Backport of r52862.
X-Git-Tag: v2.4.5c1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eff853ccd7e647d30db712fde1b82cfba09d276a;p=thirdparty%2FPython%2Fcpython.git

Backport of r52862.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index b9000a652c46..358346c96841 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)