[pypy-commit] pypy dict-strategies: merge

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: dict-strategies
Changeset: r45196:01589eca5bf8
Date: 2011-06-30 11:52 +0200
http://bitbucket.org/pypy/pypy/changeset/01589eca5bf8/

Log:	merge

diff --git a/lib-python/modified-2.7/test/test_weakref.py b/lib-python/modified-2.7/test/test_weakref.py
--- a/lib-python/modified-2.7/test/test_weakref.py
+++ b/lib-python/modified-2.7/test/test_weakref.py
@@ -993,7 +993,7 @@
         self.assertTrue(len(weakdict) == 2)
         k, v = weakdict.popitem()
         self.assertTrue(len(weakdict) == 1)
-        if k is key1:
+        if k == key1:
             self.assertTrue(v is value1)
         else:
             self.assertTrue(v is value2)
diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py
--- a/pypy/objspace/std/celldict.py
+++ b/pypy/objspace/std/celldict.py
@@ -37,6 +37,7 @@
             # when we are jitting, we always go through the pure function
             # below, to ensure that we have no residual dict lookup
             w_dict = jit.hint(w_dict, promote=True)
+            self = jit.hint(self, promote=True)
             return self._getcell_makenew(w_dict, key)
         return self.unerase(w_dict.dstorage).get(key, None)