Changeset 25346

Timestamp:

08/05/20 00:25:08 (5 years ago)

Author:

jdquinn

Message:

CHG: Default argument cannot follow *args; shlex not behaving as expected

Location:

issm/trunk-jpl/src/m

Files:

• coordsystems/epsg2proj.py (modified) (2 diffs)
• io/loadmodel.py (modified) (1 diff)
• io/loadvars.py (modified) (6 diffs)

issm/trunk-jpl/src/m/coordsystems/epsg2proj.py

@@ +1 @@
+import shlex
 import subprocess
 
 
 def epsg2proj(epsg): #{{{
-    '''
+    """
     FUNCTION EPSG2PROJ - uses gdalsrsinfo to provide PROJ.4 compatible string 
     from EPSG code
@@ -18 +19 @@
         - In case of Python 2, except socket.timeout: https://docs.python.org/3/library/socket.html?highlight=socket%20timeout#socket.timeout
         - In case of Python 3, except TimeoutExpired: https://docs.python.org/3/library/subprocess.html#subprocess.SubprocessError
-    '''
+    """
 
     #First, get GDAL version

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

@@ -33 +33 @@
     #       try:
     #recover model on file and name it md
-    struc = loadvars(path, OL=onlylast)
+    struc = loadvars(path, onlylast=onlylast)
     name = [key for key in list(struc.keys())]
     if len(name) > 1:

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

@@ -15 +15 @@
 
 
-def loadvars(*args, OL):
-    '''
+def loadvars(*args, **kwargs):
+    """
     LOADVARS - function to load variables from a file.
 
@@ -30 +30 @@
         nvdict = loadvars('shelve.dat', {'a':None, 'b':None})
         nvdict = loadvars('shelve.dat')
-    '''
+    """
 
     filename = ''
@@ -55 +55 @@
     else:
         raise TypeError("Unrecognized input arguments.")
+
+    onlylast = False
+
+    for key, value in kwargs.items():
+        if key == 'onlylast':
+            onlylast = value
 
     if whichdb(filename):   #We used python pickle for the save
@@ -110 +116 @@
                             nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [OrderedDict() for i in range(max(1, len(curclass.groups)))]
                         else:
-                            if OL:   #we load only the last result to save on time and memory
+                            if onlylast:   #we load only the last result to save on time and memory
                                 nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [getattr(__import__(listtype), listtype)()]
                                 Tree = nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]]
@@ -126 +132 @@
                         if AllHaveTime:
                             #Time dimension is in all the variables so we take that as stepnumber for the results
-                            if OL:   #we load only the last result to save on time and memory
+                            if onlylast:   #we load only the last result to save on time and memory
                                 nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]] = [getattr(__import__(listtype), listtype)()]
                                 Tree = nvdict['md'].__dict__[classtree[mod][0]].__dict__[classtree[mod][1]]
@@ -166 +172 @@
                         NewFormat = 'Time' in NCFile.dimensions
                         if type(Tree) == list and NewFormat:
-                            if OL:
+                            if onlylast:
                                 if vardim == 1:
                                     Tree[0].__dict__[str(var)] = varval[-1].data