Changeset 13950 for issm/trunk-jpl/src/m/io/loadvars.py

Timestamp:

11/13/12 11:22:43 (12 years ago)

Author:

jschierm

Message:

CHG: Allow more inputs in Python savevars and loadvars.

File:

• issm/trunk-jpl/src/m/io/loadvars.py (modified) (2 diffs)

issm/trunk-jpl/src/m/io/loadvars.py

@@ -32 +32 @@
 
         if   len(args) >= 2 and isinstance(args[1],(str,unicode)):    # (filename,name)
-                nvdict[args[1]]=None
+                for name in args[1:]:
+                        nvdict[name]=None
 
-        elif len(args) >= 2 and isinstance(args[1],list):    # (filename,[names])
+        elif len(args) == 2 and isinstance(args[1],list):    # (filename,[names])
                 for name in args[1]:
                         nvdict[name]=None
 
-        elif len(args) >= 2 and isinstance(args[1],dict):    # (filename,{names:values})
+        elif len(args) == 2 and isinstance(args[1],dict):    # (filename,{names:values})
                 nvdict=args[1]
 
@@ -71 +72 @@
 
         if   len(args) >= 2 and isinstance(args[1],(str,unicode)):    # (value)
-                return nvdict[args[1]]
+                value=[nvdict[name] for name in args[1:]]
+                return value
 
-        elif len(args) >= 2 and isinstance(args[1],list):    # ([values])
+        elif len(args) == 2 and isinstance(args[1],list):    # ([values])
                 value=[nvdict[name] for name in args[1]]
                 return value
 
-        elif (len(args) >= 2 and isinstance(args[1],dict)) or (len(args) == 1):    # ({names:values})
+        elif (len(args) == 2 and isinstance(args[1],dict)) or (len(args) == 1):    # ({names:values})
                 return nvdict