mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Backport of r52862.

Browse source
This commit is contained in:
Armin Rigo 2006-11-29 22:07:38 +00:00
parent 84a90cade5
commit 1bc1ab23d3
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/ceval.c
View file

@ -4046,8 +4046,10 @@ import_all_from(PyObject *locals, PyObject *v)
value = PyObject_GetAttr(v, name); value = PyObject_GetAttr(v, name);
if (value == NULL) if (value == NULL)
err = -1; err = -1;
else else if (PyDict_CheckExact(locals))
err = PyDict_SetItem(locals, name, value); err = PyDict_SetItem(locals, name, value);
else
err = PyObject_SetItem(locals, name, value);
Py_DECREF(name); Py_DECREF(name);
Py_XDECREF(value); Py_XDECREF(value);
if (err != 0) if (err != 0)