Changeset 26744 for issm/trunk/src/m/modules/ExpToLevelSet.py

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/modules/ExpToLevelSet.py (modified) (3 diffs)

issm/trunk/src/m/modules/ExpToLevelSet.py

@@ +1 @@
+from ExpToLevelSet_python import ExpToLevelSet_python
 from helpers import fileparts
 from shpread import shpread
@@ -23 +24 @@
     """
 
-    if isinstance(contourname, basestring):
+    if isinstance(contourname, str):
         path, name, ext = fileparts(contourname)
         if ext == '.shp':
@@ -29 +30 @@
             contourname = shpread(contourname)
 
-    # NOTE: This library does not currently exist! See TODO list in function 
+    # NOTE: This module does not currently exist! See TODO list in function 
     #       header.
     distance = ExpToLevelSet_python(x, y, contourname)