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

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-12-30 00:08:15 -0600 (Tue, 30 Dec 2008)
New Revision: 6267

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

........
  r6265 | cdavid | 2008-12-30 15:03:56 +0900 (Tue, 30 Dec 2008) | 1 line
  
  Fix typo.
........



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
   + /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

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:08:06 UTC (rev 6266)
+++ branches/fix_float_format/numpy/core/tests/test_print.py	2008-12-30 06:08:15 UTC (rev 6267)
@@ -8,7 +8,7 @@
 _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.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)'