Author: Amaury Forgeot d'Arc <[email protected]>
Branch: stdlib-3.2.5
Changeset: r70408:1984a39792cd
Date: 2014-04-02 22:24 +0200
http://bitbucket.org/pypy/pypy/changeset/1984a39792cd/
Log: hg merge py3k
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -1202,10 +1202,10 @@
return True
def unwrap(self, w_item):
- return self.space.str_w(w_item)
+ return self.space.bytes_w(w_item)
def wrap(self, item):
- return self.space.wrap(item)
+ return self.space.wrapbytes(item)
def iter(self, w_set):
return BytesIteratorImplementation(self.space, self, w_set)
diff --git a/pypy/objspace/std/test/test_setobject.py
b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -348,6 +348,11 @@
s = set([b'hello'])
assert s.pop() == b'hello'
+ def test_set_literal(self):
+ """
+ assert {b'a'}.pop() == b'a'
+ """
+
def test_compare(self):
assert set('abc') != 'abc'
raises(TypeError, "set('abc') < 42")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
