mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 08:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.

Browse source
This commit is contained in:
Raymond Hettinger 2007-03-20 21:45:04 +00:00
parent 42f4cfa9b6
commit f94e89c578
4 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/dictobject.c
View file

@ -1175,6 +1175,24 @@ dict_fromkeys(PyObject *cls, PyObject *args)
if (d == NULL)
return NULL;
if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) {
dictobject *mp = (dictobject *)d;
Py_ssize_t pos = 0;
PyObject *key;
long hash;
if (dictresize(mp, PySet_GET_SIZE(seq)))
return NULL;
while (_PySet_NextEntry(seq, &pos, &key, &hash)) {
Py_INCREF(key);
Py_INCREF(Py_None);
if (insertdict(mp, key, hash, Py_None))
return NULL;
}
return d;
}
it = PyObject_GetIter(seq);
if (it == NULL){
Py_DECREF(d);

20
Objects/setobject.c
View file

@ -2137,7 +2137,7 @@ PySet_Add(PyObject *set, PyObject *key)
}
int
_PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **entry)
_PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key)
{
setentry *entry_ptr;
@ -2147,7 +2147,23 @@ _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **entry)
}
if (set_next((PySetObject *)set, pos, &entry_ptr) == 0)
return 0;
*entry = entry_ptr->key;
*key = entry_ptr->key;
return 1;
}
int
_PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash)
{
setentry *entry;
if (!PyAnySet_Check(set)) {
PyErr_BadInternalCall();
return -1;
}
if (set_next((PySetObject *)set, pos, &entry) == 0)
return 0;
*key = entry->key;
*hash = entry->hash;
return 1;
}