STY: Further simplification

Co-authored-by: Chris Markiewicz <effigies@gmail.com>

Author: DimitriPapadopoulos

nipype/interfaces/afni/utils.py

@@ -234,7 +234,7 @@ def aggregate_outputs(self, runtime=None, needed_outputs=None):
             m = re.search(pattern, line)
             if m:
                 d = m.groupdict()
-                outputs.trait_set(**{k: int(d[k]) for k in d})
+                outputs.trait_set(**{k: int(v) for k, v in d.items()})
         return outputs
 
 

nipype/interfaces/cmtk/convert.py

@@ -194,11 +194,11 @@ def _run_interface(self, runtime):
             for data in self.inputs.data_files:
                 _, data_name, _ = split_filename(data)
                 cda = cf.CData(name=data_name, src=data, fileformat="NumPy")
-                if string.find(data_name, 'lengths') != -1:
+                if 'lengths' in data_name:
                     cda.dtype = "FinalFiberLengthArray"
-                if string.find(data_name, 'endpoints') != -1:
+                if 'endpoints' in data_name:
                     cda.dtype = "FiberEndpoints"
-                if string.find(data_name, 'labels') != -1:
+                if 'labels' in data_name:
                     cda.dtype = "FinalFiberLabels"
                 a.add_connectome_data(cda)
 

nipype/interfaces/cmtk/nx.py

@@ -166,7 +166,7 @@ def average_networks(in_files, ntwk_res_file, group_id):
         for edge in edges:
             data = ntwk.edge[edge[0]][edge[1]]
             if ntwk.edge[edge[0]][edge[1]]["count"] >= count_to_keep_edge:
-                for key in list(data.keys()):
+                for key in data:
                     if key != "count":
                         data[key] = data[key] / len(in_files)
                 ntwk.edge[edge[0]][edge[1]] = data
@@ -183,7 +183,7 @@ def average_networks(in_files, ntwk_res_file, group_id):
         avg_edges = avg_ntwk.edges()
         for edge in avg_edges:
             data = avg_ntwk.edge[edge[0]][edge[1]]
-            for key in list(data.keys()):
+            for key in data:
                 if key != "count":
                     edge_dict[key] = np.zeros(
                         (avg_ntwk.number_of_nodes(), avg_ntwk.number_of_nodes())

nipype/interfaces/slicer/generate_classes.py

@@ -33,10 +33,7 @@ def force_to_valid_python_variable_name(old_name):
 
 def add_class_to_package(class_codes, class_names, module_name, package_dir):
     module_python_filename = os.path.join(package_dir, "%s.py" % module_name)
-    with (
-        open(module_python_filename, "w") as f_m,
-        open(os.path.join(package_dir, "__init__.py"), "a+") as f_i,
-    ):
+    with open(module_python_filename, "w") as f_m:
         f_m.write(
             """# -*- coding: utf-8 -*-
 \"\"\"Autogenerated file - DO NOT EDIT
@@ -48,6 +45,7 @@ def add_class_to_package(class_codes, class_names, module_name, package_dir):
 import os\n\n\n"""
         f_m.write(imports)
         f_m.write("\n\n".join(class_codes))
+    with open(os.path.join(package_dir, "__init__.py"), "a+") as f_i:
         f_i.write("from {} import {}\n".format(module_name, ", ".join(class_names)))