Apply suggestions from code review

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

Author: HippocampusGirl

nipype/pipeline/engine/utils.py

@@ -1115,10 +1115,8 @@ def make_field_func(*pair):
                     #       Non-IdentityInterface w/ iterables
                     #   - src_idJ\d+ : JoinNode(IdentityInterface)
                     if itername.startswith(src_id):
-                        itername = itername[len(src_id):]
-                        if re.fullmatch(
-                            r"((\.[a-z](I\.[a-z])?|J)\d+)?", itername
-                        ):
+                        suffix = itername[len(src_id):]
+                        if re.fullmatch(r"((\.[a-z](I\.[a-z])?|J)\d+)?", suffix):
                             expansions[src_id].append(node)
             for in_id, in_nodes in list(expansions.items()):
                 logger.debug(

nipype/pipeline/engine/workflows.py

@@ -913,11 +913,9 @@ def _set_node_input(self, node, param, source, sourceinfo):
         node.set_input(param, deepcopy(newval))
 
     def _get_all_nodes(self):
-        allnodes = [
-            *self._nodes_cache.difference(self._nested_workflows_cache)
-        ]  # all nodes that are not workflows
+        allnodes = self._nodes_cache - self._nested_workflows_cache
         for node in self._nested_workflows_cache:
-            allnodes.extend(node._get_all_nodes())
+            allnodes |= node._get_all_nodes()
         return allnodes
 
     def _update_node_cache(self):