fix(SU2_PY): Python 3 correctness and PEP 8 fixes

- Use identity operators for None comparisons (is/is not)
- Replace bare except with Exception/OSError
- Replace .has_key() and .iteritems() with Python 3 equivalents
- Fix mutable default arguments in function signatures

Signed-off-by: shbhmexe <[email protected]>

Author: shbhmexe

SU2_PY/SU2/io/data.py

@@ -115,7 +115,7 @@ def load_data(file_name, var_names=None, file_format="infer", core_name="python_
     #: with filelock
 
     # load specified varname into dictionary
-    if var_names != None:
+    if var_names is not None:
         # check for one item name array
         if isinstance(var_names, str):
             var_names = [
@@ -196,7 +196,7 @@ def save_data(
                 core_name=core_name,
             )
             # check for keys not in new data
-            for key, value in data_dict_old.iteritems():
+            for key, value in data_dict_old.items():
                 if not (key in data_dict):
                     data_dict[key] = value
             #: for each dict item
@@ -365,7 +365,7 @@ def rec2dict(array_in):
         # convert array
         elif isinstance(value, numpy.ndarray):
             # check for another struct level
-            if value.dtype.names == None:
+            if value.dtype.names is None:
                 value = value.tolist()
             # telescoping
             else:
@@ -418,7 +418,7 @@ def append_nestdict(base_dict, add_dict):
     for key in add_dict.keys():
 
         # ensure base_dict key exists and is a list
-        if not base_dict.has_key(key):
+        if key not in base_dict:
             if isinstance(add_dict[key], dict):
                 base_dict[key] = {}
             else:

SU2_PY/SU2/io/state.py

@@ -111,7 +111,7 @@ def State_Factory(state=None, config=None):
         config = state
         state = None
 
-    if not state is None:
+    if state is not None:
         assert isinstance(state, State), "input is must be a state instance"
         return state
 

SU2_PY/SU2/io/tools.py

@@ -45,18 +45,17 @@ def read_gradients(Grad_filename, scale=1.0):
     """
 
     # open file and skip first line
-    gradfile = open(Grad_filename)
-    gradfile.readline()
-
-    # read values
-    grad_vals = []
-    for line in gradfile:
-        line = line.strip()
-        if len(line) == 0:
-            break
-        grad_vals.append(float(line) * scale)
-    #: for each line
-
+    with open(Grad_filename) as gradfile:
+        gradfile.readline()
+
+        # read values
+        grad_vals = []
+        for line in gradfile:
+            line = line.strip()
+            if len(line) == 0:
+                break
+            grad_vals.append(float(line) * scale)
+    # done
     return grad_vals
 
 
@@ -387,7 +386,7 @@ def read_aerodynamics(
                 Func_Values[key] = history_data["TAVG_" + key][-1]
     else:
         # in steady cases take only last value.
-        for key, value in Func_Values.iteritems():
+        for key, value in Func_Values.items():
             if not history_data.get(key):
                 raise KeyError(
                     "Key "
@@ -641,7 +640,7 @@ def get_dvID(kindName):
     try:
         return id_map[kindName]
     except KeyError:
-        raise Exception("Unrecognized Design Variable Name: %s", kindName)
+        raise Exception("Unrecognized Design Variable Name: %s" % kindName)
 
 
 #: def get_dvID()
@@ -652,7 +651,10 @@ def get_dvID(kindName):
 # -------------------------------------------------------------------
 
 
-def get_gradFileFormat(grad_type, plot_format, kindID, special_cases=[]):
+def get_gradFileFormat(grad_type, plot_format, kindID, special_cases=None):
+
+    if special_cases is None:
+        special_cases = []
 
     # start header, build a list of strings and join at the end
     header = []
@@ -731,7 +733,7 @@ def get_gradFileFormat(grad_type, plot_format, kindID, special_cases=[]):
         write_format.append(r", %s, %s, %s")
     elif kindID == "CST":
         header.append(r',"Up/Down","Kulfan number", "Total Kulfan numbers"')
-        write_format.append(r", %s, %s", "%s")
+        write_format.append(r", %s, %s, %s")
     elif kindID == "FAIRING":
         header.append(r',"ControlPoint_Index","Theta_Disp","R_Disp"')
         write_format.append(r", %s, %s, %s")
@@ -1170,7 +1172,7 @@ def make_link(src, dst):
             os.symlink(src, dst)
 
 
-def restart2solution(config, state={}):
+def restart2solution(config, state=None):
     """restart2solution(config,state={})
     moves restart file to solution file,
     optionally updates state

SU2_PY/SU2/run/interface.py

@@ -56,9 +56,9 @@
     mpi_Command = os.environ["SU2_MPI_COMMAND"]
 elif slurm_job:
     mpi_Command = "srun -n %i %s"
-elif not which("mpirun") is None:
+elif which("mpirun") is not None:
     mpi_Command = "mpirun -n %i %s"
-elif not which("mpiexec") is None:
+elif which("mpiexec") is not None:
     mpi_Command = "mpiexec -n %i %s"
 else:
     mpi_Command = ""

SU2_PY/SU2/run/projection.py

@@ -41,7 +41,7 @@
 # ----------------------------------------------------------------------
 
 
-def projection(config, state={}, step=1e-3):
+def projection(config, state=None, step=1e-3):
     """info = SU2.run.projection(config,state,step=1e-3)
 
     Runs an gradient projection with:

SU2_PY/SU2/util/plot.py

@@ -88,9 +88,9 @@ def write_plot(filename, plot_format, data_plot, keys_plot=None):
     return
 
 
-def tecplot(filename, data_plot, keys_plot=[]):
+def tecplot(filename, data_plot, keys_plot=None):
     write_plot(filename, "TECPLOT", data_plot, keys_plot)
 
 
-def paraview(filename, data_plot, keys_plot=[]):
+def paraview(filename, data_plot, keys_plot=None):
     write_plot(filename, "CSV", data_plot, keys_plot)

SU2_PY/SU2_CFD.py

@@ -120,7 +120,7 @@ def main():
     options.wave_equation = options.wave_equation.upper() == "TRUE"
     options.heat_equation = options.heat_equation.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     if options.with_MPI == True:
@@ -163,7 +163,7 @@ def main():
     # Finalize the solver and exit cleanly
     SU2Driver.Finalize()
 
-    if SU2Driver != None:
+    if SU2Driver is not None:
         del SU2Driver
 
 

SU2_PY/parallel_computation.py

@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)

SU2_PY/parallel_computation_fsi.py

@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)

SU2_PY/topology_optimization.py

@@ -123,7 +123,7 @@ def obj_val(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objValFile)
-        except:
+        except OSError:
             pass
 
         try:
@@ -136,7 +136,7 @@ def obj_val(self, x):
                     break
             # the return code of mpirun is useless, we test the value of the function
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Objective function evaluation failed")
         # end
 
@@ -150,7 +150,7 @@ def obj_der(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objDerFile)
-        except:
+        except OSError:
             pass
         N = x.shape[0]
         y = np.ndarray((N,))
@@ -167,7 +167,7 @@ def obj_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * obj_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Objective gradient evaluation failed")
         # end
 
@@ -186,7 +186,7 @@ def con_val(self, x):
                     val = float(lines[1].split(",")[col])
                     break
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -200,7 +200,7 @@ def con_der(self, x):
         # clear previous output and run solver
         try:
             os.remove(self._conDerFile)
-        except:
+        except OSError:
             pass
         N = x.shape[0]
         y = np.ndarray((N,))
@@ -217,7 +217,7 @@ def con_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * con_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -295,7 +295,7 @@ def finished(self):
         return self._value == self._maxi
 
     def value(self):
-        if self._func == None:
+        if self._func is None:
             return self._value
         else:
             return self._func(self._value)