source: issm/oecreview/Archive/13393-13976/ISSM-13949-13950.diff@ 14312

Last change on this file since 14312 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 2.4 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/m/io/savevars.py
2===================================================================
3--- ../trunk-jpl/src/m/io/savevars.py (revision 13949)
4+++ ../trunk-jpl/src/m/io/savevars.py (revision 13950)
5@@ -31,13 +31,14 @@
6 raise TypeError("Missing file name.")
7
8 if len(args) >= 3 and isinstance(args[1],(str,unicode)): # (filename,name,value)
9- nvdict[args[1]]=args[2]
10+ for i in xrange(1,len(args),2):
11+ nvdict[args[i]]=args[i+1]
12
13- elif len(args) >= 3 and isinstance(args[1],list) and isinstance(args[2],list): # (filename,[names],[values])
14+ elif len(args) == 3 and isinstance(args[1],list) and isinstance(args[2],list): # (filename,[names],[values])
15 for name,value in zip(args[1],args[2]):
16 nvdict[name]=value
17
18- elif len(args) >= 2 and isinstance(args[1],dict): # (filename,{names:values})
19+ elif len(args) == 2 and isinstance(args[1],dict): # (filename,{names:values})
20 nvdict=args[1]
21
22 else:
23Index: ../trunk-jpl/src/m/io/loadvars.py
24===================================================================
25--- ../trunk-jpl/src/m/io/loadvars.py (revision 13949)
26+++ ../trunk-jpl/src/m/io/loadvars.py (revision 13950)
27@@ -31,13 +31,14 @@
28 raise TypeError("Missing file name.")
29
30 if len(args) >= 2 and isinstance(args[1],(str,unicode)): # (filename,name)
31- nvdict[args[1]]=None
32+ for name in args[1:]:
33+ nvdict[name]=None
34
35- elif len(args) >= 2 and isinstance(args[1],list): # (filename,[names])
36+ elif len(args) == 2 and isinstance(args[1],list): # (filename,[names])
37 for name in args[1]:
38 nvdict[name]=None
39
40- elif len(args) >= 2 and isinstance(args[1],dict): # (filename,{names:values})
41+ elif len(args) == 2 and isinstance(args[1],dict): # (filename,{names:values})
42 nvdict=args[1]
43
44 elif len(args) == 1: # (filename)
45@@ -70,12 +71,13 @@
46 my_shelf.close()
47
48 if len(args) >= 2 and isinstance(args[1],(str,unicode)): # (value)
49- return nvdict[args[1]]
50+ value=[nvdict[name] for name in args[1:]]
51+ return value
52
53- elif len(args) >= 2 and isinstance(args[1],list): # ([values])
54+ elif len(args) == 2 and isinstance(args[1],list): # ([values])
55 value=[nvdict[name] for name in args[1]]
56 return value
57
58- elif (len(args) >= 2 and isinstance(args[1],dict)) or (len(args) == 1): # ({names:values})
59+ elif (len(args) == 2 and isinstance(args[1],dict)) or (len(args) == 1): # ({names:values})
60 return nvdict
61
Note: See TracBrowser for help on using the repository browser.