use hanging indent & more descriptive error message

Signed-off-by: Brian Chen <[email protected]>
ros2 · Jun 29, 2022 · 198575d · 198575d
1 parent 81ca3bb
commit 198575d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/ros2param/ros2param/api/__init__.py b/ros2param/ros2param/api/__init__.py
@@ -44,7 +44,8 @@ def load_parameter_file(*, node, node_name, parameter_file, use_wildcard):
     client = AsyncParameterClient(node, node_name)
     ready = client.wait_for_services(timeout_sec=5.0)
     if not ready:
-        raise RuntimeError('Wait for service timed out')
+        raise RuntimeError(f'Wait for service timed out waiting for'
+                           'parameter services for node {node_name}')
     future = client.load_parameter_file(parameter_file, use_wildcard)
     parameters = list(parameter_dict_from_yaml_file(parameter_file, use_wildcard).values())
     rclpy.spin_until_future_complete(node, future)
@@ -69,7 +70,8 @@ def call_describe_parameters(*, node, node_name, parameter_names=None):
     client = AsyncParameterClient(node, node_name)
     ready = client.wait_for_services(timeout_sec=5.0)
     if not ready:
-        raise RuntimeError('Wait for service timed out')
+        raise RuntimeError(f'Wait for service timed out waiting for'
+                           'parameter services for node {node_name}')
     future = client.describe_parameters(parameter_names)
     rclpy.spin_until_future_complete(node, future)
     response = future.result()
@@ -83,7 +85,8 @@ def call_get_parameters(*, node, node_name, parameter_names):
     client = AsyncParameterClient(node, node_name)
     ready = client.wait_for_services(timeout_sec=5.0)
     if not ready:
-        raise RuntimeError('Wait for service timed out')
+        raise RuntimeError(f'Wait for service timed out waiting for'
+                           'parameter services for node {node_name}')
     future = client.get_parameters(parameter_names)
     rclpy.spin_until_future_complete(node, future)
     response = future.result()
@@ -97,7 +100,8 @@ def call_set_parameters(*, node, node_name, parameters):
     client = AsyncParameterClient(node, node_name)
     ready = client.wait_for_services(timeout_sec=5.0)
     if not ready:
-        raise RuntimeError('Wait for service timed out')
+        raise RuntimeError(f'Wait for service timed out waiting for'
+                           'parameter services for node {node_name}')
     future = client.set_parameters(parameters)
     rclpy.spin_until_future_complete(node, future)
     response = future.result()
@@ -111,7 +115,8 @@ def call_list_parameters(*, node, node_name, prefixes=None):
     client = AsyncParameterClient(node, node_name)
     ready = client.wait_for_services(timeout_sec=5.0)
     if not ready:
-        raise RuntimeError('Wait for service timed out')
+        raise RuntimeError(f'Wait for service timed out waiting for'
+                           'parameter services for node {node_name}')
     future = client.list_parameters(prefixes=prefixes)
     rclpy.spin_until_future_complete(node, future)
     response = future.result()

diff --git a/ros2param/ros2param/verb/list.py b/ros2param/ros2param/verb/list.py
@@ -71,9 +71,10 @@ def main(self, *, args):  # noqa: D102
         with DirectNode(args) as node:
             responses = {}
             for node_name in node_names:
-                responses[node_name] = call_list_parameters(node=node,
-                                                            node_name=node_name.full_name,
-                                                            prefixes=args.param_prefixes)
+                responses[node_name] = call_list_parameters(
+                    node=node,
+                    node_name=node_name.full_name,
+                    prefixes=args.param_prefixes)
             # print responses
             for node_name in sorted(responses.keys()):
                 response = responses[node_name]