From bbd8893419339d692a909b6ddda46fd6d83feb97 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Fri, 12 Apr 2019 18:15:59 -0700 Subject: [PATCH] Move try-except to verb Signed-off-by: Jacob Perron --- ros2action/ros2action/api/__init__.py | 10 ++-------- ros2action/ros2action/verb/info.py | 11 +++++++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ros2action/ros2action/api/__init__.py b/ros2action/ros2action/api/__init__.py index 964f2ac36..de9f0d921 100644 --- a/ros2action/ros2action/api/__init__.py +++ b/ros2action/ros2action/api/__init__.py @@ -32,14 +32,8 @@ def get_action_clients_and_servers(*, node, action_name): action_clients = [] action_servers = [] - try: - expanded_name = expand_topic_name(action_name, node.get_name(), node.get_namespace()) - except ValueError as e: - raise RuntimeError(e) - try: - validate_full_topic_name(expanded_name) - except rclpy.exceptions.InvalidTopicNameException as e: - raise RuntimeError(e) + expanded_name = expand_topic_name(action_name, node.get_name(), node.get_namespace()) + validate_full_topic_name(expanded_name) node_names_and_ns = node.get_node_names_and_namespaces() for node_name, node_ns in node_names_and_ns: diff --git a/ros2action/ros2action/verb/info.py b/ros2action/ros2action/verb/info.py index 8cfe5ac4e..53b218b33 100644 --- a/ros2action/ros2action/verb/info.py +++ b/ros2action/ros2action/verb/info.py @@ -35,10 +35,13 @@ def add_arguments(self, parser, cli_name): def main(self, *, args): with DirectNode(args) as node: - action_clients, action_servers = get_action_clients_and_servers( - node=node, - action_name=args.action_name, - ) + try: + action_clients, action_servers = get_action_clients_and_servers( + node=node, + action_name=args.action_name, + ) + except Exception as e: + raise RuntimeError(e) print('Action: {}'.format(args.action_name)) print('Action clients: {}'.format(len(action_clients)))