[pypy-svn] pypy 32ptr-on-64bit: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 32ptr-on-64bit
Changeset: r43428:7d65297ee4b3
Date: 2011-04-17 02:49 -0700
http://bitbucket.org/pypy/pypy/changeset/7d65297ee4b3/

Log:	merge heads

diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -520,7 +520,7 @@
         unerase = unerase_item
     else:
         erase = lambda x: x
-        unerase = lambda x, t: x
+        unerase = lambda x: x
     #
     class subcls(BaseMapdictObject, supercls):
         _nmin1 = nmin1

diff --git a/pypy/objspace/std/test/test_mapdict.py b/pypy/objspace/std/test/test_mapdict.py
--- a/pypy/objspace/std/test/test_mapdict.py
+++ b/pypy/objspace/std/test/test_mapdict.py
@@ -438,6 +438,14 @@
         assert obj2.getdictvalue(space, "b") is w6
         assert obj2.map is abmap
 
+        extras = {}
+        for attr in "cdefghijklmnopqrstuvwxyz":
+            extras[attr] = W_Root()
+            obj2.setdictvalue(space, attr, extras[attr])
+            assert obj2.getdictvalue(space, attr) is extras[attr]
+        for attr in "cdefghijklmnopqrstuvwxyz":
+            assert obj2.getdictvalue(space, attr) is extras[attr]
+
 def test_specialized_class_compressptr():
     test_specialized_class(compressptr=True)