Author: Philip Jenvey <pjen...@underboss.org> Branch: Changeset: r68445:61a7394c57ff Date: 2013-12-17 11:41 -0800 http://bitbucket.org/pypy/pypy/changeset/61a7394c57ff/
Log: simplify diff --git a/pypy/module/__builtin__/app_operation.py b/pypy/module/__builtin__/app_operation.py --- a/pypy/module/__builtin__/app_operation.py +++ b/pypy/module/__builtin__/app_operation.py @@ -1,8 +1,5 @@ +import operator + def bin(x): - if isinstance(x, (int, long)): - value = x - elif hasattr(x, '__index__'): - value = x.__index__() - else: - raise TypeError("object cannot be interpreted as an index") + value = operator.index(x) return value.__format__("#b") 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 @@ -54,7 +54,7 @@ def __int__(self): return 42 exc = raises(TypeError, bin, D()) - assert exc.value.message.find("object cannot be interpreted as an index") != -1 + assert "index" in exc.value.message def test_unichr(self): import sys _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit