Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r84814:342ade5f1037
Date: 2016-05-29 17:54 +0200
http://bitbucket.org/pypy/pypy/changeset/342ade5f1037/
Log: 2to3
diff --git a/pypy/module/__builtin__/test/test_functional.py
b/pypy/module/__builtin__/test/test_functional.py
--- a/pypy/module/__builtin__/test/test_functional.py
+++ b/pypy/module/__builtin__/test/test_functional.py
@@ -587,9 +587,9 @@
raises(TypeError, min, 1, 2, key=lambda x: x, bar=2)
assert type(min(1, 1.0)) is int
assert type(min(1.0, 1)) is float
- assert type(min(1, 1.0, 1L)) is int
- assert type(min(1.0, 1L, 1)) is float
- assert type(min(1L, 1, 1.0)) is long
+ assert type(min(1, 1.0, 1)) is int
+ assert type(min(1.0, 1, 1)) is float
+ assert type(min(1, 1, 1.0)) is int
def test_max(self):
assert max(1, 2) == 2
@@ -599,6 +599,6 @@
raises(TypeError, max, 1, 2, key=lambda x: x, bar=2)
assert type(max(1, 1.0)) is int
assert type(max(1.0, 1)) is float
- assert type(max(1, 1.0, 1L)) is int
- assert type(max(1.0, 1L, 1)) is float
- assert type(max(1L, 1, 1.0)) is long
+ assert type(max(1, 1.0, 1)) is int
+ assert type(max(1.0, 1, 1)) is float
+ assert type(max(1, 1, 1.0)) is int
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
