Changeset 25100

Timestamp:

06/22/20 11:39:17 (5 years ago)

Author:

jdquinn

Message:

BUG: Bad name for subprocess args.

Location:

issm/trunk-jpl/src/m

Files:

• coordsystems/epsg2proj.py (modified) (3 diffs)
• mesh/planet/gmsh/gmshplanet.py (modified) (1 diff)

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

@@ -15 +15 @@
 
     TODO:
-    - Implement try/catch for proc.communicate()
+    - Implement try/catch for subproc.communicate()
         - 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
@@ -21 +21 @@
 
     #First, get GDAL version
-    args = "gdalsrsinfo --version | awk '{print $2}' | cut -d '.' -f1"
-    proc = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    outs, errs = proc.communicate()
+    subproc_args = "gdalsrsinfo --version | awk '{print $2}' | cut -d '.' -f1"
+    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    outs, errs = subproc.communicate()
     if errs != '':
         raise RuntimeError("epsg2proj: call to gdalsrsinfo failed: {}".format(errs))
@@ -29 +29 @@
     version_major=int(outs)
 
-args = "gdalsrsinfo epsg:{} | grep PROJ.4 | tr -d '\n' | sed 's/PROJ.4 : //'".format(epsg)
-proc = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-outs, errs = proc.communicate()
-if errs != '':
-    raise RuntimeError("epsg2proj: call to gdalsrsinfo failed: {}".format(errs))
+    subproc_args = "gdalsrsinfo epsg:{} | grep PROJ.4 | tr -d '\n' | sed 's/PROJ.4 : //'".format(epsg)
+    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    outs, errs = subproc.communicate()
+    if errs != '':
+        raise RuntimeError("epsg2proj: call to gdalsrsinfo failed: {}".format(errs))
 
     if version_major == 1:

issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

@@ -26 +26 @@
 
     # Get Gmsh version
-    args = "gmsh -info | grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
-    proc = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    outs, errs = proc.communicate()
+    subproc_args = "gmsh -info | grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
+    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    outs, errs = subproc.communicate()
     if errs != '':
         raise Exception("gmshplanet: call to gmsh failed: {}".format(errs))
     gmshmajorversion = int(outs)
     if gmshmajorversion not in [3, 4]:
-        raise RuntimeError("gmshplanet: Gmsh major version {} not supported!".format( gmshmajorversion))
+        raise RuntimeError("gmshplanet: Gmsh major version {} not supported!".format(gmshmajorversion))
 
     #process options