[Python-checkins] r52862 - python/trunk/Python/ceval.c

Wed Nov 29 22:59:23 CET 2006

Author: armin.rigo
Date: Wed Nov 29 22:59:22 2006
New Revision: 52862
Modified:
 python/trunk/Python/ceval.c
Log:
Forgot a case where the locals can now be a general mapping
instead of just a dictionary. (backporting...)
Modified: python/trunk/Python/ceval.c
==============================================================================

--- python/trunk/Python/ceval.c	(original)
+++ python/trunk/Python/ceval.c	Wed Nov 29 22:59:22 2006
@@ -4046,8 +4046,10 @@
 		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)
