[Python-checkins] cpython (merge 3.1 -> 3.2): Merge from 3.1.

Wed Mar 23 04:53:57 CET 2011

http://hg.python.org/cpython/rev/4fb6dfa8d08c
changeset: 68861:4fb6dfa8d08c
branch: 3.2
parent: 68853:a1e685ceb3bd
parent: 68860:57657393ceaf
user: Éric Araujo <merwok at netwok.org>
date: Wed Mar 23 03:43:22 2011 +0100
summary:
 Merge from 3.1.
The fix was already committed to 3.2, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.
files:
 Lib/test/test_set.py
 Objects/setobject.c

diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -365,11 +365,12 @@
 {
 register Py_ssize_t n_used;
 PyObject *key = entry->key;
+ Py_hash_t hash = entry->hash;
 
 assert(so->fill <= so->mask); /* at least one empty slot */
 n_used = so->used;
 Py_INCREF(key);
- if (set_insert_key(so, key, entry->hash) == -1) {
+ if (set_insert_key(so, key, hash) == -1) {
 Py_DECREF(key);
 return -1;
 }
@@ -639,6 +640,7 @@
 {
 PySetObject *other;
 PyObject *key;
+ Py_hash_t hash;
 register Py_ssize_t i;
 register setentry *entry;
 
@@ -660,10 +662,11 @@
 for (i = 0; i <= other->mask; i++) {
 entry = &other->table[i];
 key = entry->key;
+ hash = entry->hash;
 if (key != NULL &&
 key != dummy) {
 Py_INCREF(key);
- if (set_insert_key(so, key, entry->hash) == -1) {
+ if (set_insert_key(so, key, hash) == -1) {
 Py_DECREF(key);
 return -1;
 }
-- 
Repository URL: http://hg.python.org/cpython
