Author: Ronan Lamy <[email protected]>
Branch: py3.5
Changeset: r87967:fc6f2c8d65f7
Date: 2016-10-28 00:05 +0100
http://bitbucket.org/pypy/pypy/changeset/fc6f2c8d65f7/
Log: Remove unnecessary test duplication
diff --git a/pypy/objspace/std/test/test_complexobject.py
b/pypy/objspace/std/test/test_complexobject.py
--- a/pypy/objspace/std/test/test_complexobject.py
+++ b/pypy/objspace/std/test/test_complexobject.py
@@ -265,27 +265,16 @@
assert self.close(complex(5.3, 9.8).conjugate(), 5.3-9.8j)
def test_constructor(self):
- class OS:
- def __init__(self, value):
- self.value = value
- def __complex__(self):
- return self.value
class NS(object):
def __init__(self, value):
self.value = value
def __complex__(self):
return self.value
- assert complex(OS(1+10j)) == 1+10j
assert complex(NS(1+10j)) == 1+10j
- assert complex(OS(1+10j), 5) == 1+15j
assert complex(NS(1+10j), 5) == 1+15j
- assert complex(OS(1+10j), 5j) == -4+10j
assert complex(NS(1+10j), 5j) == -4+10j
- assert complex(OS(2.0)) == 2+0j
assert complex(NS(2.0)) == 2+0j
- assert complex(OS(2)) == 2+0j
assert complex(NS(2)) == 2+0j
- raises(TypeError, complex, OS(None))
raises(TypeError, complex, NS(None))
raises(TypeError, complex, b'10')
@@ -299,7 +288,6 @@
class F(object):
def __float__(self):
return 2.0
- assert complex(OS(1+10j), F()) == 1+12j
assert complex(NS(1+10j), F()) == 1+12j
assert self.almost_equal(complex("1+10j"), 1+10j)
@@ -670,7 +658,7 @@
assert sign(z1.imag) == -1
assert sign(z2.real) == -1
assert sign(z2.real) == -1
-
+
def test_hash_minus_one(self):
assert hash(-1.0 + 0j) == -2
assert (-1.0 + 0j).__hash__() == -2
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
