[Numpy-svn] r6270 - in branches/fix_float_format: . numpy/core/tests

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-12-30 00:28:22 -0600 (Tue, 30 Dec 2008)
New Revision: 6270

Modified:
   branches/fix_float_format/
   branches/fix_float_format/numpy/core/tests/test_print.py
Log:
Merged revisions 6268 via svnmerge from 
http://svn.scipy.org/svn/numpy/trunk

........
  r6268 | cdavid | 2008-12-30 15:12:26 +0900 (Tue, 30 Dec 2008) | 1 line
  
  complex scalar arrays cannot be created from real/imag args: wrap init values in a complex.
........



Property changes on: branches/fix_float_format
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/distutils-revamp:1-2752 /branches/dynamic_cpu_configuration:1-6101 /branches/multicore:1-3687 /branches/numpy-mingw-w64:1-6150 /branches/visualstudio_manifest:1-6077 /trunk:1-6244,6251,6253,6256,6258,6260-6261,6263,6265-6266
   + /branches/distutils-revamp:1-2752 /branches/dynamic_cpu_configuration:1-6101 /branches/multicore:1-3687 /branches/numpy-mingw-w64:1-6150 /branches/visualstudio_manifest:1-6077 /trunk:1-6269

Modified: branches/fix_float_format/numpy/core/tests/test_print.py
===================================================================
--- branches/fix_float_format/numpy/core/tests/test_print.py	2008-12-30 06:12:51 UTC (rev 6269)
+++ branches/fix_float_format/numpy/core/tests/test_print.py	2008-12-30 06:28:22 UTC (rev 6270)
@@ -6,15 +6,15 @@
 from StringIO import StringIO
 
 _REF = {np.inf: 'inf', -np.inf: '-inf', np.nan: 'nan',
-        np.complex64(np.inf, 1): '(inf+1j)',
-        np.complex64(np.nan, 1): '(nan+1j)',
-        np.complex64(-np.inf, 1): '(-inf+1j)',
-        np.cdouble(np.inf, 1): '(inf+1j)',
-        np.cdouble(np.nan, 1): '(nan+1j)',
-        np.cdouble(-np.inf, 1): '(-inf+1j)',
-        np.clongdouble(np.inf, 1): '(inf+1j)',
-        np.clongdouble(np.nan, 1): '(nan+1j)',
-        np.clongdouble(-np.inf, 1): '(-inf+1j)'
+        np.complex64(complex(np.inf, 1)): '(inf+1j)',
+        np.complex64(complex(np.nan, 1)): '(nan+1j)',
+        np.complex64(complex(-np.inf, 1)): '(-inf+1j)',
+        np.cdouble(complex(np.inf, 1)): '(inf+1j)',
+        np.cdouble(complex(np.nan, 1)): '(nan+1j)',
+        np.cdouble(complex(-np.inf, 1)): '(-inf+1j)',
+        np.clongdouble(complex(np.inf, 1)): '(inf+1j)',
+        np.clongdouble(complex(np.nan, 1)): '(nan+1j)',
+        np.clongdouble(complex(-np.inf, 1)): '(-inf+1j)'
         }
 
 if sys.platform == 'win32' and sys.version_info[0] <= 2 and sys.version_info[1] <= 5: