Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3.2

Browse source
This commit is contained in:
Petri Lehtinen 2011-10-24 21:17:52 +03:00
commit 24bd5adcff
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/dictobject.c
View file

@ -1314,14 +1314,18 @@ dict_fromkeys(PyObject *cls, PyObject *args)
PyObject *key;
Py_hash_t hash;
if (dictresize(mp, Py_SIZE(seq)))
if (dictresize(mp, Py_SIZE(seq))) {
Py_DECREF(d);
return NULL;
}
while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) {
Py_INCREF(key);
Py_INCREF(value);
if (insertdict(mp, key, hash, value))
if (insertdict(mp, key, hash, value)) {
Py_DECREF(d);
return NULL;
}
}
return d;
}
@ -1332,14 +1336,18 @@ dict_fromkeys(PyObject *cls, PyObject *args)
PyObject *key;
Py_hash_t hash;
if (dictresize(mp, PySet_GET_SIZE(seq)))
if (dictresize(mp, PySet_GET_SIZE(seq))) {
Py_DECREF(d);
return NULL;
}
while (_PySet_NextEntry(seq, &pos, &key, &hash)) {
Py_INCREF(key);
Py_INCREF(value);
if (insertdict(mp, key, hash, value))
if (insertdict(mp, key, hash, value)) {
Py_DECREF(d);
return NULL;
}
}
return d;
}