[pypy-commit] pypy py3.5: back out changeset: d46f72070fa8, solution is more complicated tahn a one-line fix

mattip pypy.commits at gmail.com
Sun Feb 11 13:31:55 EST 2018


Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r93800:71e87bfd8acd
Date: 2018-02-11 13:31 -0500
http://bitbucket.org/pypy/pypy/changeset/71e87bfd8acd/

Log:	back out changeset: d46f72070fa8, solution is more complicated tahn
	a one-line fix

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
@@ -767,7 +767,7 @@
 
     def switch_to_text_strategy(self, w_dict):
         w_obj = self.unerase(w_dict.dstorage)
-        strategy = self.space.fromcache(UnicodeDictStrategy)
+        strategy = self.space.fromcache(BytesDictStrategy)
         str_dict = strategy.unerase(strategy.get_empty_storage())
         w_dict.set_strategy(strategy)
         w_dict.dstorage = strategy.erase(str_dict)
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
@@ -802,18 +802,6 @@
         d[1] = 3
         a.__dict__ = {}
 
-    def test_dict_limit(self):
-        class A(object):
-            pass
-        a = A()
-        for n in (40, 1000):
-            for i in range(n):
-                v = str(i).encode().decode('utf8')
-                setattr(a, v, i)
-            for i in range(n):
-                v = str(i).encode().decode('utf8')
-                assert (n, getattr(a, v)) == (n, i)
-
     def test_dict_clear_bug(self):
         class A(object):
             pass


More information about the pypy-commit mailing list