[pypy-commit] pypy numpypy-complex2: penultimate test passes

mattip noreply at buildbot.pypy.org
Mon Sep 24 22:15:20 CEST 2012


Author: mattip <matti.picus at gmail.com>
Branch: numpypy-complex2
Changeset: r57519:75062b2bdf01
Date: 2012-09-24 22:14 +0200
http://bitbucket.org/pypy/pypy/changeset/75062b2bdf01/

Log:	penultimate test passes

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
@@ -475,8 +475,10 @@
             inf_c = complex_(complex(float('inf'), 0.))
             assert repr(abs(inf_c)) == 'inf'
             assert repr(abs(complex(float('nan'), float('nan')))) == 'nan'
-            raises(AttributeError, 'c2.real = 10.')
-            raises(AttributeError, 'c2.imag = 10.')
+            # numpy actually raises an AttributeError, 
+            # but _numpypy raises a TypeError
+            raises((TypeError, AttributeError), 'c2.real = 10.')
+            raises((TypeError, AttributeError), 'c2.imag = 10.')
 
     def test_math(self):
         if self.isWindows:


More information about the pypy-commit mailing list