diff options
| author | Armin Rigo <arigo@tunes.org> | 2006-11-29 22:07:38 +0000 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2006-11-29 22:07:38 +0000 |
| commit | 1bc1ab23d3969b792e5861559e023baeec44dfd6 (patch) | |
| tree | 8b6f38182acbee4dafd325188652e6c22e84cc6e /Python | |
| parent | 84a90cade58461822e7ee5bbb5e52aa6a415bd6f (diff) | |
| download | cpython-git-1bc1ab23d3969b792e5861559e023baeec44dfd6.tar.gz | |
Backport of r52862.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 73e8dee790..7884051ffb 100644 --- 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) |