diff --git a/launch_ros/launch_ros/parameter_descriptions.py b/launch_ros/launch_ros/parameter_descriptions.py index 3d67c4d7..bae6e4d3 100644 --- a/launch_ros/launch_ros/parameter_descriptions.py +++ b/launch_ros/launch_ros/parameter_descriptions.py @@ -83,7 +83,7 @@ def value_type(self) -> AllowedTypesType: def __str__(self) -> Text: return ( 'launch_ros.description.ParameterValue' - f'(value={self.value}, value_type={self.value_type})' + f'(value={self.value}, value_type={self.value_type.__name__})' ) def evaluate(self, context: LaunchContext) -> 'EvaluatedParameterValue': @@ -148,7 +148,7 @@ def value_type(self) -> AllowedTypesType: def __str__(self) -> Text: return ( 'launch_ros.description.Parameter' - f'(name={self.name}, value={self.value}, value_type={self.value_type})' + f'(name={self.name}, value={self.value}, value_type={self.value_type.__name__})' ) def evaluate(self, context: LaunchContext) -> Tuple[Text, 'EvaluatedParameterValue']: diff --git a/launch_ros/launch_ros/utilities/evaluate_parameters.py b/launch_ros/launch_ros/utilities/evaluate_parameters.py index 8917bc74..f5390199 100644 --- a/launch_ros/launch_ros/utilities/evaluate_parameters.py +++ b/launch_ros/launch_ros/utilities/evaluate_parameters.py @@ -102,7 +102,14 @@ def check_sequence_type_is_allowed(sequence): ', Sequence[int], Sequence[float], Sequence[str]. Got {}.' 'If the parameter is meant to be a string, try wrapping it in ' 'launch_ros.parameter_descriptions.ParameterValue' +<<<<<<< HEAD '(value, value_type=str)'.format(type(yaml_evaluated_value)) +======= + '(value, value_type=str)'.format( + type(yaml_evaluated_value).__name__, + evaluated_name + ) +>>>>>>> 9c5f6a7 (improve type readability in errors (#469)) ) elif isinstance(value[0], Sequence): # Value is an array of a list of substitutions