Author: Ronan Lamy <[email protected]>
Branch: py3.6
Changeset: r91904:6e9e65d8b76a
Date: 2017-07-16 13:58 +0000
http://bitbucket.org/pypy/pypy/changeset/6e9e65d8b76a/
Log: Merged in mad-marty/pypy/py3.6 (pull request #558)
(ronan,pzieschang) fixed test_intobject behaviour for python 3.6 as
well with bool
diff --git a/pypy/objspace/std/test/test_intobject.py
b/pypy/objspace/std/test/test_intobject.py
--- a/pypy/objspace/std/test/test_intobject.py
+++ b/pypy/objspace/std/test/test_intobject.py
@@ -405,10 +405,10 @@
value = 4200000000000000000000000000000000
assert int(j()) == 4200000000000000000000000000000000
value = subint(42)
- assert int(j()) == 42 and type(int(j())) is subint
+ assert int(j()) == 42 and type(int(j())) is int
value = subint(4200000000000000000000000000000000)
assert (int(j()) == 4200000000000000000000000000000000
- and type(int(j())) is subint)
+ and type(int(j())) is int)
value = 42.0
raises(TypeError, int, j())
value = "foo"
@@ -473,7 +473,7 @@
return True
n = int(TruncReturnsNonInt())
assert n == 1
- assert type(n) is bool
+ assert type(n) is int
def test_int_before_string(self):
class Integral(str):
@@ -639,7 +639,7 @@
warnings.simplefilter("always", DeprecationWarning)
n = int(bad)
m = _operator.index(bad)
- assert n is True
+ assert n == 1 and type(n) is int
assert m is False
assert len(log) == 2
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
