summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2008-12-30 06:28:22 +0000
committerDavid Cournapeau <cournape@gmail.com>2008-12-30 06:28:22 +0000
commitcebec2247bd9c1d459e1722f8da9e42009851660 (patch)
tree4346aa229da7399f7fc541bf938c447076a6093d
parent778d33648daeda86be016c1c6a490a2fb5387b1d (diff)
parent0fb51ad9a424075ef441159c9d92779d692f4032 (diff)
downloadnumpy-cebec2247bd9c1d459e1722f8da9e42009851660.tar.gz
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. ........
-rw-r--r--numpy/core/tests/test_print.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/tests/test_print.py b/numpy/core/tests/test_print.py
index 16ed8c657..d216edd92 100644
--- a/numpy/core/tests/test_print.py
+++ b/numpy/core/tests/test_print.py
@@ -6,15 +6,15 @@ import sys
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: