Improve readability

Signed-off-by: Kenji Miyake <[email protected]>

Author: Kenji Miyake

launch_ros/launch_ros/actions/composable_node_container.py

@@ -63,8 +63,11 @@ def parse(cls, entity: Entity, parser: Parser):
         composable_nodes = entity.get_attr(
             'composable_node', data_type=List[Entity], optional=True)
         if composable_nodes is not None:
-            parsed_tuples = [ComposableNode.parse(parser, entity) for entity in composable_nodes]
-            kwargs['composable_node_descriptions'] = [t[0](**t[1]) for t in parsed_tuples]
+            kwargs['composable_node_descriptions'] = []
+            for entity in composable_nodes:
+                _, composable_node_kwargs = ComposableNode.parse(parser, entity)
+                kwargs['composable_node_descriptions'].append(
+                    ComposableNode(**composable_node_kwargs))
 
         return cls, kwargs
 

launch_ros/launch_ros/actions/load_composable_nodes.py

@@ -95,9 +95,11 @@ def parse(cls, entity: Entity, parser: Parser):
             entity.get_attr('target', data_type=str))
 
         composable_nodes = entity.get_attr('composable_node', data_type=List[Entity])
-        if composable_nodes is not None:
-            parsed_tuples = [ComposableNode.parse(parser, entity) for entity in composable_nodes]
-            kwargs['composable_node_descriptions'] = [t[0](**t[1]) for t in parsed_tuples]
+        kwargs['composable_node_descriptions'] = []
+        for entity in composable_nodes:
+            _, composable_node_kwargs = ComposableNode.parse(parser, entity)
+            kwargs['composable_node_descriptions'].append(
+                ComposableNode(**composable_node_kwargs))
 
         return cls, kwargs