Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r58884:aee08b7cacd0
Date: 2012-11-05 17:27 +0100
http://bitbucket.org/pypy/pypy/changeset/aee08b7cacd0/
Log: unskip and fix this test
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -589,7 +589,7 @@
def is_correct_type(self, w_obj):
space = self.space
- return space.is_w(space.type(w_obj), space.w_text)
+ return space.is_w(space.type(w_obj), space.w_str)
def get_empty_storage(self):
res = {}
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py
b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -144,10 +144,10 @@
assert space.eq_w(w_d.getitem_str("b"), space.w_None)
def test_listview_str_dict(self):
- py.test.py3k_skip("StringDictStrategy not supported yet")
w = self.space.wrap
+ wb = self.space.wrapbytes
w_d = self.space.newdict()
- w_d.initialize_content([(w("a"), w(1)), (w("b"), w(2))])
+ w_d.initialize_content([(wb("a"), w(1)), (wb("b"), w(2))])
assert self.space.listview_str(w_d) == ["a", "b"]
def test_listview_unicode_dict(self):
@@ -644,6 +644,7 @@
setattr(a, s, 123)
assert holder.seen is s
+
class AppTestDictViews:
def test_dictview(self):
d = {1: 2, 3: 4}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
