Changeset 23719

Timestamp:

02/13/19 04:45:30 (6 years ago)

Author:

bdef

Message:

BUG:fixing an import incompatibility

Location:

issm/trunk-jpl/src/m

Files:

• classes/organizer.py (modified) (4 diffs)
• io/loadmodel.py (modified) (2 diffs)
• io/loadvars.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/organizer.py

@@ -6 +6 @@
 from savevars import savevars
 from model import model
-from dbm.ndbm import whichdb
+#hack to keep python 2 compatipility
+try:
+        #py3 import
+        from dbm.ndbm import whichdb
+except ImportError:
+        #py2 import
+        from whichdb import whichdb
+
 import MatlabFuncs as m
 
@@ -55 +62 @@
                 #Get steps
                 self.requestedsteps=options.getfieldvalue('steps',[0])
-                
+
                 #Get trunk prefix (only if provided by user)
                 if options.exist('trunkprefix'):
@@ -131 +138 @@
                         raise TypeError("Step provided should not have any white space")
                 if self._currentstep>0 and string in [step['string'] for step in self.steps]:
-                        raise RuntimeError("Step '%s' already present. Change name" % string) 
+                        raise RuntimeError("Step '%s' already present. Change name" % string)
 
                 #Add step
@@ -139 +146 @@
                 self._currentstep+=1
 
-                #if requestedsteps = 0, print all steps in self 
+                #if requestedsteps = 0, print all steps in self
                 if 0 in self.requestedsteps:
                         if self._currentstep==1:

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

@@ -1 +1 @@
 from loadvars import loadvars
-from dbm.ndbm import whichdb
+#hack to keep python 2 compatipility
+try:
+        #py3 import
+        from dbm.ndbm import whichdb
+except ImportError:
+        #py2 import
+        from whichdb import whichdb
 from netCDF4 import Dataset
 
@@ -8 +14 @@
 
            check that model prototype has not changed. if so, adapt to new model prototype.
-        
+
            Usage:
               md=loadmodel(path)

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

@@ -7 +7 @@
 from os import path
 from collections import OrderedDict
-from dbm.ndbm import whichdb
 from model import *
+#hack to keep python 2 compatipility
+try:
+        #py3 import
+        from dbm.ndbm import whichdb
+except ImportError:
+        #py2 import
+        from whichdb import whichdb
 
 def loadvars(*args):