From b9bb6d7e726018c818b842285c5761b495496db0 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 21 Oct 2020 09:52:38 -0700 Subject: [PATCH 1/3] Add error message if ComposableNodeContainer 'namespace' arg is None This restores the original behavior in Eloquent and Foxy, but with an improved error message. Signed-off-by: Jacob Perron --- launch_ros/launch_ros/actions/composable_node_container.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/launch_ros/launch_ros/actions/composable_node_container.py b/launch_ros/launch_ros/actions/composable_node_container.py index f278d91b..880a52f0 100644 --- a/launch_ros/launch_ros/actions/composable_node_container.py +++ b/launch_ros/launch_ros/actions/composable_node_container.py @@ -77,7 +77,10 @@ def __init__( ) namespace = node_namespace - if not namespace: + if namespace is None: + raise RuntimeError("'namespace' is a required argument") + + if namespace == '': namespace = '/' super().__init__(name=name, namespace=namespace, **kwargs) self.__composable_node_descriptions = composable_node_descriptions From 7c11b834e675d2c8aad5d587d24c47364f76b588 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 21 Oct 2020 10:19:38 -0700 Subject: [PATCH 2/3] Improve error message for no node name Signed-off-by: Jacob Perron --- launch_ros/launch_ros/actions/composable_node_container.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/launch_ros/launch_ros/actions/composable_node_container.py b/launch_ros/launch_ros/actions/composable_node_container.py index 880a52f0..563a71b4 100644 --- a/launch_ros/launch_ros/actions/composable_node_container.py +++ b/launch_ros/launch_ros/actions/composable_node_container.py @@ -77,6 +77,10 @@ def __init__( ) namespace = node_namespace + + if name is None: + raise RuntimeError("'name' is a required argument") + if namespace is None: raise RuntimeError("'namespace' is a required argument") From b85002d6b6954c61e90d9b177171b84744c06c85 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 21 Oct 2020 10:52:09 -0700 Subject: [PATCH 3/3] Fix flake8 Signed-off-by: Jacob Perron --- launch_ros/launch_ros/actions/composable_node_container.py | 1 - 1 file changed, 1 deletion(-) diff --git a/launch_ros/launch_ros/actions/composable_node_container.py b/launch_ros/launch_ros/actions/composable_node_container.py index 563a71b4..28fcdc84 100644 --- a/launch_ros/launch_ros/actions/composable_node_container.py +++ b/launch_ros/launch_ros/actions/composable_node_container.py @@ -77,7 +77,6 @@ def __init__( ) namespace = node_namespace - if name is None: raise RuntimeError("'name' is a required argument")