Skip to content

Commit e03c8b2

Browse files
committed
finish linting
Signed-off-by: Steve Macenski <[email protected]>
1 parent 7b4fd4a commit e03c8b2

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

launch_ros/launch_ros/descriptions/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
"""descriptions Module."""
1616

17-
from .composable_node import ComposableNode
1817
from .composable_lifecycle_node import ComposableLifecycleNode
18+
from .composable_node import ComposableNode
1919
from ..parameter_descriptions import Parameter
2020
from ..parameter_descriptions import ParameterFile
2121
from ..parameter_descriptions import ParameterValue

launch_ros/launch_ros/descriptions/composable_lifecycle_node.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
1818
from typing import Optional
1919

2020
import launch
21-
from launch.condition import Condition
22-
from launch.some_substitutions_type import SomeSubstitutionsType
2321
from launch.substitution import Substitution
2422
# from launch.utilities import ensure_argument_type
2523
from launch.utilities import perform_substitutions
2624
from launch_ros.parameters_type import Parameters
27-
from launch_ros.parameters_type import SomeParameters
2825
from launch_ros.remap_rule_type import RemapRules
29-
from launch_ros.remap_rule_type import SomeRemapRules
3026
from launch_ros.utilities import LifecycleEventManager
3127

3228
from .composable_node import ComposableNode
3329

3430

3531
class ComposableLifecycleNode(ComposableNode):
3632
"""Describes a lifecycle node that can be loaded into a container with other nodes."""
33+
3734
def __init__(
3835
self, *,
3936
autostart: bool = False,

launch_ros/launch_ros/event_handlers/on_state_transition.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(
3333
self,
3434
*,
3535
entities: SomeEntitiesType,
36-
target_lifecycle_node: Optional['LifecycleNode'] = None,
36+
target_lifecycle_node: Optional['LifecycleNode'] = None, # noqa: F821
3737
transition: Optional[SomeSubstitutionsType] = None,
3838
start_state: Optional[SomeSubstitutionsType] = None,
3939
goal_state: Optional[SomeSubstitutionsType] = None,
@@ -51,17 +51,17 @@ def __init__(
5151
If matcher is given, the other conditions are not considered.
5252
"""
5353
lifecycle_property = type(target_lifecycle_node).__dict__.get('is_lifecycle_node', None)
54-
if not isinstance(lifecycle_property, (property, type(None))):
55-
raise RuntimeError('OnStateTransition requires a "LifecycleNode" action as the target,'
56-
' target_lifecycle_node is not a node type.')
54+
if target_lifecycle_node and not isinstance(lifecycle_property, (property)):
55+
raise RuntimeError('OnStateTransition requires a lifecycle enabled node as the target,'
56+
' target_lifecycle_node is not a lifecycle-enabled node type.')
5757

5858
if (
5959
target_lifecycle_node and
6060
hasattr(target_lifecycle_node, 'is_lifecycle_node') and
6161
not target_lifecycle_node.is_lifecycle_node
6262
):
63-
raise RuntimeError('OnStateTransition requires a "LifecycleNode" action as the target,'
64-
' target_lifecycle_node is not a lifecycle-enabled node.')
63+
raise RuntimeError('OnStateTransition requires a lifecycle enabled node as the target,'
64+
' target_lifecycle_node is not lifecycle-enabled.')
6565

6666
# Handle optional matcher argument.
6767
self.__custom_matcher = matcher

0 commit comments

Comments
 (0)