From 418ea4cffcf64b0ab12f9b0664301299f84ea11a Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Thu, 12 Mar 2020 18:02:21 -0700 Subject: [PATCH] Address minor issues Signed-off-by: Emerson Knapp --- ros2node/ros2node/api/__init__.py | 10 +++++----- ros2node/ros2node/verb/list.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ros2node/ros2node/api/__init__.py b/ros2node/ros2node/api/__init__.py index ec6de20ed..39be42867 100644 --- a/ros2node/ros2node/api/__init__.py +++ b/ros2node/ros2node/api/__init__.py @@ -51,7 +51,7 @@ def parse_node_name(node_name): def annotate_duplicate_nodes(node_names: List[NodeName]) -> Tuple[bool, List[str]]: """ - Annotate a list of node names with a warnings if names are not unique. + Annotate a list of node names with a warning if names are not unique. :param node_names: list of all NodeNames observed in the graph :return Tuple containing: @@ -66,13 +66,13 @@ def annotate_duplicate_nodes(node_names: List[NodeName]) -> Tuple[bool, List[str count = name_count.get(n.full_name, 0) + 1 if count > 1: any_duplicates = True - name_count[n.full_name] = name_count.get(n.full_name, 0) + 1 + name_count[n.full_name] = count - sorted_names = sorted( + annotated_names = [ n.full_name + (annotation_string if name_count[n.full_name] > 1 else '') for n in node_names - ) - return any_duplicates, sorted_names + ] + return any_duplicates, annotated_names def get_node_names(*, node, include_hidden_nodes=False): diff --git a/ros2node/ros2node/verb/list.py b/ros2node/ros2node/verb/list.py index bf387f7fc..f2ea2e9c5 100644 --- a/ros2node/ros2node/verb/list.py +++ b/ros2node/ros2node/verb/list.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import sys from ros2cli.node.strategy import add_arguments