Fix-up test_scalarmath to compare against ufuncs.

2 files changed, 11 insertions, 42 deletions

diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 6489be17a..c27bb19ae 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -11,6 +11,7 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'ufunc',
            'array2string', 'get_printoptions', 'set_printoptions',
            'array_repr', 'array_str', 'set_string_function',
            'little_endian',
+           'fromiter',
            'indices', 'fromfunction',
            'load', 'loads', 'isscalar', 'binary_repr', 'base_repr',
            'ones', 'identity', 'allclose',
@@ -67,6 +68,10 @@ def empty_like(a):
 
 # end Fernando's utilities
 
+def fromiter(obj, dtype=None):
+    obj = list(obj)
+    return array(obj, dtype=dtype)
+
 def extend_all(module):
     adict = {}
     for a in __all__:
diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index 0eeb74e06..a8aeb324e 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.py
@@ -11,57 +11,21 @@ types = [N.bool_, N.byte, N.ubyte, N.short, N.ushort, N.intc, N.uintc,
          N.single, N.double, N.longdouble, N.csingle,
          N.cdouble, N.clongdouble]
 
-# These were generated using old umath
-typeconv = array([
-    [ 0,  1,  2,  3,  4,  5,  6,  5,  6,  9, 10, 11, 12, 13, 14, 15, 16],
-    [ 1,  1,  3,  3,  4,  5,  6,  5,  6,  9, 10, 11, 12, 13, 14, 15, 16],
-    [ 2,  3,  2,  3,  4,  5,  6,  5,  6,  9, 10, 11, 12, 13, 14, 15, 16],
-    [ 3,  3,  3,  3,  5,  5,  6,  5,  6,  9, 10, 11, 12, 13, 14, 15, 16],
-    [ 4,  4,  4,  5,  4,  5,  6,  5,  6,  9, 10, 11, 12, 13, 14, 15, 16],
-    [ 5,  5,  5,  5,  5,  5,  9,  5,  9,  9, 10, 12, 12, 13, 15, 15, 16],
-    [ 6,  6,  6,  6,  6,  9,  6,  9,  6,  9, 10, 12, 12, 13, 15, 15, 16],
-    [ 7,  7,  7,  7,  7,  7,  9,  7,  9,  9, 10, 12, 12, 13, 15, 15, 16],
-    [ 8,  8,  8,  8,  8,  9,  8,  9,  8,  9, 10, 12, 12, 13, 15, 15, 16],
-    [ 9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 12, 12, 12, 13, 15, 15, 16],
-    [10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 10, 12, 12, 13, 15, 15, 16],
-    [11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 11, 12, 13, 14, 15, 16],
-    [12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 15, 15, 16],
-    [13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 16, 16, 16],
-    [14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 14, 15, 16, 14, 15, 16],
-    [15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 15, 15, 16],
-    [16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16]
-    ])
-
-typeconv2 = array([
-    ['?','b','B','h','H','i','I','i','I','q','Q','f','d','g','F','D','G'],
-    ['b','b','h','h','H','i','I','i','I','q','Q','f','d','g','F','D','G'],
-    ['B','h','B','h','H','i','I','i','I','q','Q','f','d','g','F','D','G'],
-    ['h','h','h','h','i','i','I','i','I','q','Q','f','d','g','F','D','G'],
-    ['H','H','H','i','H','i','I','i','I','q','Q','f','d','g','F','D','G'],
-    ['i','i','i','i','i','i','q','i','q','q','Q','d','d','g','D','D','G'],
-    ['I','I','I','I','I','q','I','q','I','q','Q','d','d','g','D','D','G'],
-    ['l','l','l','l','l','l','q','l','q','q','Q','d','d','g','D','D','G'],
-    ['L','L','L','L','L','q','L','q','L','q','Q','d','d','g','D','D','G'],
-    ['q','q','q','q','q','q','q','q','q','q','d','d','d','g','D','D','G'],
-    ['Q','Q','Q','Q','Q','Q','Q','Q','Q','d','Q','d','d','g','D','D','G'],
-    ['f','f','f','f','f','d','d','d','d','d','d','f','d','g','F','D','G'],
-    ['d','d','d','d','d','d','d','d','d','d','d','d','d','g','D','D','G'],
-    ['g','g','g','g','g','g','g','g','g','g','g','g','g','g','G','G','G'],
-    ['F','F','F','F','F','D','D','D','D','D','D','F','D','G','F','D','G'],
-    ['D','D','D','D','D','D','D','D','D','D','D','D','D','G','D','D','G'],
-    ['G','G','G','G','G','G','G','G','G','G','G','G','G','G','G','G','G']
-    ],'S1')
+# This compares scalarmath against ufuncs. 
 
 class test_types(ScipyTestCase):
     def check_types(self, level=1):
         # list of types
         for k, atype in enumerate(types):
             vala = atype(3)
+            val1 = array([3],dtype=atype)
             for l, btype in enumerate(types):
                 valb = btype(1)
+                val2 = array([1],dtype=btype)
                 val = vala+valb
-                assert val.dtype.num == typeconv[k,l] and \
-                       val.dtype.char == typeconv2[k,l], \
+                valo = val1 + val2
+                assert val.dtype.num == valo.dtype.num and \
+                       val.dtype.char == valo.dtype.char, \
                        "error with (%d,%d)" % (k,l)
 
 if __name__ == "__main__":