Changeset 3093 for trunk/python

Timestamp:

02/15/16 20:12:31 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (bug fixes)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap._to_list()

Description: A fix to have asap._to_list() return a list not tuple nor numpy.ndarray.

A fix to have asap._is_sequence_or_number understand numpy.ndarray.

File:

• trunk/python/utils.py (modified) (2 diffs)

trunk/python/utils.py

@@ -16 +16 @@
 
 def _is_sequence_or_number(param, ptype=int):
-    if isinstance(param,tuple) or isinstance(param,list):
+    import numpy
+    #if isinstance(param,tuple) or isinstance(param,list):
+    if type(param) in (tuple, list, numpy.ndarray):
         if len(param) == 0: return True # empty list
         out = True
@@ -31 +33 @@
         else: return [param]
     if _is_sequence_or_number(param, ptype):
-        return param
+        return list(param)
     return None