Changeset 21357

Timestamp:

11/10/16 03:25:10 (8 years ago)

Author:

sjohnsen

Message:

CHG:added OrderedDict

File:

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

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

@@ -6 +6 @@
 from re import findall
 from os import path
+from collections import OrderedDict
 from whichdb import whichdb
 from collections import OrderedDict
@@ -98 +99 @@
                                         listtype=curclass.groups[keylist[0]].classtype
                                         if listtype=='dict':
-                                                nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [{} for i in range(max(1,len(curclass.groups)))]
+                                                nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [OrderedDict() for i in range(max(1,len(curclass.groups)))]
                                         else:
                                                 nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [getattr(__import__(listtype),listtype)() for i in range(max(1,len(curclass.groups)))]
@@ -106 +107 @@
                                         Tree=nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]]
                         else:
-                                curclass=NCFile.groups[classtree[mod][0]]
+                                curclass=NCFile.groups[classtree[mod][0]]
                                 nvdict['md'].__dict__[mod] = getattr(classtype[mod][1],classtype[mod][0])()
                                 Tree=nvdict['md'].__dict__[classtree[mod][0]]