Changeset 6456 for branches/numpy/anuga/utilities/numerical_tools.py

Timestamp:

Mar 5, 2009, 8:29:28 AM (14 years ago)

Author:

rwilson

Message:

More testing for ensure_numeric()

File:

• branches/numpy/anuga/utilities/numerical_tools.py (modified) (3 diffs)

branches/numpy/anuga/utilities/numerical_tools.py

@@ -249 +249 @@
         typecode:    numeric type. If specified, use this in the conversion.
                      If not, let numeric package decide.
-                     numpy assumes float64 if no type in A.
                      typecode will always be one of num.float, num.int, etc.
 
@@ -258 +257 @@
     """
 
-    if isinstance(A, basestring):
-        msg = 'Sorry, cannot handle string in ensure_numeric()'
+    #if isinstance(A, basestring):
+    if isinstance(A, str):
+        msg = 'ASorry, cannot handle strings in ensure_numeric()'
         raise Exception, msg
+
+    try:
+        elt = A[0]
+    except TypeError:
+        pass
+    else:
+        if isinstance(A, basestring):
+            msg = 'BSorry, cannot handle strings in ensure_numeric()'
+            raise Exception, msg
+
 
     if typecode is None:
@@ -271 +281 @@
 
 
-
-
 def histogram(a, bins, relative=False):
     """Standard histogram straight from the numeric manual