mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge

Browse source
This commit is contained in:
Raymond Hettinger 2015-07-15 23:52:29 -07:00
commit d702044bcd
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Objects/setobject.c
View file

@ -668,7 +668,8 @@ set_merge(PySetObject *so, PyObject *otherset)
}
/* We can't assure there are no duplicates, so do normal insertions */
for (i = 0; i <= other->mask; i++, other_entry++) {
for (i = 0; i <= other->mask; i++) {
other_entry = &other->table[i];
key = other_entry->key;
if (key != NULL && key != dummy) {
if (set_add_entry(so, key, other_entry->hash))