Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r68484:5547c4821d09
Date: 2013-12-18 20:17 -0800
http://bitbucket.org/pypy/pypy/changeset/5547c4821d09/
Log: 2to3
diff --git a/pypy/module/__builtin__/test/test_builtin.py
b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -92,7 +92,7 @@
def __int__(self):
return 42
exc = raises(TypeError, bin, D())
- assert "index" in exc.value.message
+ assert "index" in str(exc.value)
def test_oct(self):
class Foo:
diff --git a/pypy/objspace/std/test/test_longobject.py
b/pypy/objspace/std/test/test_longobject.py
--- a/pypy/objspace/std/test/test_longobject.py
+++ b/pypy/objspace/std/test/test_longobject.py
@@ -301,7 +301,7 @@
def test_long_before_string(self):
class A(str):
- def __long__(self):
+ def __int__(self):
return 42
assert int(A('abc')) == 42
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
