flake8-comprehensions

Author: pancetta

.flake8

@@ -1,9 +1,14 @@
 [flake8]
 max-line-length = 120
-ignore = E741, E402, W504, W605
+select = C4
+ignore = E741, E402, W504, W605, C408
 per-file-ignores =
     pySDC/tutorial/step_6/C_MPI_parallelization.py:F401,
     pySDC/projects/Hamiltonian/solar_system.py:F401
 exclude =
     playgrounds
     tests
+    */data/*
+count = True
+show-source = True
+statistics = True

pySDC/core/Step.py

@@ -201,12 +201,12 @@ def connect_levels(self, base_transfer_class, base_transfer_params, space_transf
         self.base_transfer = base_transfer_class(fine_level, coarse_level, base_transfer_params,
                                                  space_transfer_class, space_transfer_params)
         # use base_transfer dictionary twice to set restrict and prolong operator
-        self.__transfer_dict[tuple([fine_level, coarse_level])] = self.base_transfer.restrict
+        self.__transfer_dict[(fine_level, coarse_level)] = self.base_transfer.restrict
 
         if self.base_transfer.params.finter:
-            self.__transfer_dict[tuple([coarse_level, fine_level])] = self.base_transfer.prolong_f
+            self.__transfer_dict[(coarse_level, fine_level)] = self.base_transfer.prolong_f
         else:
-            self.__transfer_dict[tuple([coarse_level, fine_level])] = self.base_transfer.prolong
+            self.__transfer_dict[(coarse_level, fine_level)] = self.base_transfer.prolong
 
     def transfer(self, source, target):
         """
@@ -220,7 +220,7 @@ def transfer(self, source, target):
             source (pySDC.Level.level): source level
             target (pySDC.Level.level): target level
         """
-        self.__transfer_dict[tuple([source, target])]()
+        self.__transfer_dict[(source, target)]()
 
     def reset_step(self):
         """

pySDC/helpers/transfer_helper.py

@@ -31,7 +31,7 @@ def next_neighbors_periodic(p, ps, k):
     # sort by distance
     value_index_sorted = sorted(value_index, key=lambda s: s[0])
     # take first k indices with least distance and sort them
-    return sorted(list(map(lambda s: s[1], value_index_sorted[0:k])))
+    return sorted(map(lambda s: s[1], value_index_sorted[0:k]))
 
 
 def next_neighbors(p, ps, k):
@@ -57,7 +57,7 @@ def next_neighbors(p, ps, k):
     # sort by distance
     value_index_sorted = sorted(value_index, key=lambda s: s[0])
     # take first k indices with least distance and sort them
-    return sorted(list(map(lambda s: s[1], value_index_sorted[0:k])))
+    return sorted(map(lambda s: s[1], value_index_sorted[0:k]))
 
 
 def continue_periodic_array(arr, nn):

pySDC/implementations/controller_classes/controller_nonMPI.py

@@ -132,7 +132,7 @@ def run(self, u0, t0, Tend):
         self.hooks.reset_stats()
 
         # initial ordering of the steps: 0,1,...,Np-1
-        slots = [p for p in range(num_procs)]
+        slots = list(range(num_procs))
 
         # initialize time variables of each step
         time = [t0 + sum(self.MS[j].dt for j in range(p)) for p in slots]

pySDC/projects/AllenCahn_Bayreuth/run_simple_forcing_verification.py

@@ -217,7 +217,7 @@ def visualize_radii():
         print(f'Working on {file}...')
 
         # get times and radii
-        xcoords = [k for k in results]
+        xcoords = list(results)
         computed_radii = [v[0] for k, v in results.items()]
         exact_radii = [v[1] for k, v in results.items()]
         computed_vol = [v[3] for k, v in results.items()]

pySDC/projects/AsympConv/PFASST_conv_tests.py

@@ -264,12 +264,12 @@ def plot_results(nsweeps):
     results_adv = pickle.load(file)
     file.close()
 
-    xvalues_diff = sorted(list(results_diff.keys()))
+    xvalues_diff = sorted(results_diff.keys())
     niter_diff = []
     for x in xvalues_diff:
         niter_diff.append(results_diff[x])
 
-    xvalues_adv = sorted(list(results_adv.keys()))
+    xvalues_adv = sorted(results_adv.keys())
     niter_adv = []
     for x in xvalues_adv:
         niter_adv.append(results_adv[x])

pySDC/projects/AsympConv/conv_test_to0.py

@@ -62,7 +62,7 @@ def compute_and_plot_specrad(Nnodes, lam):
 
         plt.loglog(xlist, Prho_list, linestyle='-', linewidth=3, color=color, marker=marker, markersize=10,
                    label='spectral radius, L=' + str(Nsteps))
-        plt.loglog(xlist, [item for item in predict_list], linestyle='--', linewidth=2, color=color, marker=marker,
+        plt.loglog(xlist, predict_list, linestyle='--', linewidth=2, color=color, marker=marker,
                    markersize=10, label='estimate, L=' + str(Nsteps))
 
     ax = plt.gca()

pySDC/projects/AsympConv/conv_test_toinf.py

@@ -78,7 +78,7 @@ def compute_and_plot_specrad(Nnodes, lam):
         fname = 'data/smoother_specrad_toinf_M' + str(Nnodes) + '_LU_imag.png'
     else:
         fname = 'data/smoother_specrad_toinf_M' + str(Nnodes) + '_LU_real.png'
-    plt.savefig(fname, transparent=True, bbox_inches='tight')
+    plt.savefig(fname,  transparent=True, bbox_inches='tight')
 
 
 if __name__ == "__main__":

pySDC/projects/SDC_showdown/SDC_timing_Fisher.py

@@ -182,7 +182,7 @@ def show_results(fname):
 
     plt_helper.newfig(textwidth=238.96, scale=1.0)
 
-    xcoords = [i for i in range(len(results))]
+    xcoords = list(range(len(results)))
     sorted_data = sorted([(key, results[key][0]) for key in results], reverse=True, key=lambda tup: tup[1])
     heights = [item[1] for item in sorted_data]
     keys = [(item[0][1] + ' ' + item[0][0]).replace('-', '\n') for item in sorted_data]

pySDC/projects/SDC_showdown/SDC_timing_GrayScott.py

@@ -189,7 +189,7 @@ def show_results(fname):
 
     plt_helper.newfig(textwidth=238.96, scale=1.0)
 
-    xcoords = [i for i in range(len(results))]
+    xcoords = list(range(len(results)))
     sorted_data = sorted([(key, results[key][0]) for key in results], reverse=True, key=lambda tup: tup[1])
     heights = [item[1] for item in sorted_data]
     keys = [(item[0][1] + ' ' + item[0][0]).replace('-', '\n') for item in sorted_data]