Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r58344:4ab60a17cf03
Date: 2012-10-21 12:51 +0200
http://bitbucket.org/pypy/pypy/changeset/4ab60a17cf03/
Log: __unicode__ don't exist anymore. __bytes__ is now the space method
that wekrefs have to forward.
diff --git a/pypy/module/_weakref/interp__weakref.py
b/pypy/module/_weakref/interp__weakref.py
--- a/pypy/module/_weakref/interp__weakref.py
+++ b/pypy/module/_weakref/interp__weakref.py
@@ -376,12 +376,12 @@
proxy_typedef_dict[special_method] = interp2app(func)
callable_proxy_typedef_dict[special_method] = interp2app(func)
-# __unicode__ is not yet a space operation
+# __bytes__ is not yet a space operation
def proxy_unicode(space, w_obj):
w_obj = force(space, w_obj)
- return space.call_method(w_obj, '__unicode__')
-proxy_typedef_dict['__unicode__'] = interp2app(proxy_unicode)
-callable_proxy_typedef_dict['__unicode__'] = interp2app(proxy_unicode)
+ return space.call_method(w_obj, '__bytes__')
+proxy_typedef_dict['__bytes__'] = interp2app(proxy_unicode)
+callable_proxy_typedef_dict['__bytes__'] = interp2app(proxy_unicode)
W_Proxy.typedef = TypeDef("weakproxy",
diff --git a/pypy/module/_weakref/test/test_weakref.py
b/pypy/module/_weakref/test/test_weakref.py
--- a/pypy/module/_weakref/test/test_weakref.py
+++ b/pypy/module/_weakref/test/test_weakref.py
@@ -419,14 +419,14 @@
print(s)
assert "dead" in s
- def test_unicode(self):
+ def test_bytes(self):
import _weakref
class C(object):
- def __str__(self):
- return "string"
+ def __bytes__(self):
+ return b"string"
instance = C()
- assert "__str__" in dir(_weakref.proxy(instance))
- assert str(_weakref.proxy(instance)) == "string"
+ assert "__bytes__" in dir(_weakref.proxy(instance))
+ assert bytes(_weakref.proxy(instance)) == b"string"
def test_eq(self):
import _weakref
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
