From ab67d75035b359171379ed5eafda8a0931487848 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" Date: Fri, 16 Aug 2024 18:02:00 +0200 Subject: [PATCH] Apply suggestions from code review --- .../ros2controlcli/verb/list_hardware_components.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ros2controlcli/ros2controlcli/verb/list_hardware_components.py b/ros2controlcli/ros2controlcli/verb/list_hardware_components.py index a64b1bb3da..6555860d95 100644 --- a/ros2controlcli/ros2controlcli/verb/list_hardware_components.py +++ b/ros2controlcli/ros2controlcli/verb/list_hardware_components.py @@ -54,14 +54,7 @@ def main(self, *, args): f"Hardware Component {idx+1}\n\tname: {activity_color}{component.name}{bcolors.ENDC}\n\ttype: {component.type}" ) if hasattr(component, "plugin_name"): -<<<<<<< HEAD - plugin_name = component.plugin_name - # Keep compatibility to the obsolete filed name in Humble - elif hasattr(component, "class_type"): - plugin_name = component.class_type -======= plugin_name = f"{component.plugin_name}" ->>>>>>> cce79eb (Make list controller and list hardware components immediately visualize the state. (#1606)) else: plugin_name = f"{bcolors.WARNING}plugin name missing!{bcolors.ENDC}"