Author: mattip <[email protected]>
Branch: numpypy-complex2
Changeset: r57712:8242ffdd4fb8
Date: 2012-10-01 23:43 +0200
http://bitbucket.org/pypy/pypy/changeset/8242ffdd4fb8/
Log: fix merge
diff --git a/pypy/module/micronumpy/test/test_complex.py
b/pypy/module/micronumpy/test/test_complex.py
--- a/pypy/module/micronumpy/test/test_complex.py
+++ b/pypy/module/micronumpy/test/test_complex.py
@@ -273,8 +273,6 @@
raises(TypeError, logaddexp, complex(1, 1), complex(3, 3))
raises(TypeError, logaddexp2, complex(1, 1), complex(3, 3))
raises (TypeError, fmod, complex(90,90), 3)
- raises (TypeError, min, complex(90,90), 3)
- raises (TypeError, max, complex(90,90), 3)
def test_isnan_isinf(self):
from _numpypy import isnan, isinf, array
diff --git a/pypy/rlib/rcomplex.py b/pypy/rlib/rcomplex.py
--- a/pypy/rlib/rcomplex.py
+++ b/pypy/rlib/rcomplex.py
@@ -68,7 +68,7 @@
def c_pow(x, y):
(r1, i1), (r2, i2) = x, y
if i1 == 0 and i2 == 0 and r1>=0:
- rr = pow(r1, r2)
+ rr = math.pow(r1, r2)
ir = 0.
elif r2 == 0.0 and i2 == 0.0:
rr, ir = 1, 0
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
