Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r80862:d6232c50f187
Date: 2015-11-23 18:11 +0100
http://bitbucket.org/pypy/pypy/changeset/d6232c50f187/
Log: 2to3
diff --git a/pypy/module/__builtin__/functional.py
b/pypy/module/__builtin__/functional.py
--- a/pypy/module/__builtin__/functional.py
+++ b/pypy/module/__builtin__/functional.py
@@ -214,10 +214,12 @@
start = 0
else:
w_start = space.index(w_start)
- if space.is_w(space.type(w_start), space.w_int):
+ try:
start = space.int_w(w_start)
w_start = None
- else:
+ except OperationError as e:
+ if not e.match(space, space.w_OverflowError):
+ raise
start = -1
if start == 0 and type(w_iterable) is W_ListObject:
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
@@ -313,8 +313,8 @@
enum = enumerate(range(2), 2**100)
assert list(enum) == [(2**100, 0), (2**100+1, 1)]
- enum = enumerate(range(2), sys.maxint)
- assert list(enum) == [(sys.maxint, 0), (sys.maxint+1, 1)]
+ enum = enumerate(range(2), sys.maxsize)
+ assert list(enum) == [(sys.maxsize, 0), (sys.maxsize+1, 1)]
raises(TypeError, enumerate, range(2), 5.5)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
