Skip to content

Commit 61e0409

Browse files
authored
Small fixes for modern flake8. (#1264)
It doesn't like to compare types with ==, so switch to isinstance as appropriate. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 7d52cfa commit 61e0409

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

rclpy/rclpy/parameter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def parameter_dict_from_yaml_file(
319319

320320
for n in param_keys:
321321
value = param_file[n]
322-
if type(value) != dict or 'ros__parameters' not in value:
322+
if not isinstance(value, dict) or 'ros__parameters' not in value:
323323
raise RuntimeError(f'YAML file is not a valid ROS parameter file for node {n}')
324324
param_dict.update(value['ros__parameters'])
325325
return _unpack_parameter_dict(namespace, param_dict)
@@ -337,7 +337,7 @@ def _unpack_parameter_dict(namespace, parameter_dict):
337337
for param_name, param_value in parameter_dict.items():
338338
full_param_name = namespace + param_name
339339
# Unroll nested parameters
340-
if type(param_value) == dict:
340+
if isinstance(param_value, dict):
341341
parameters.update(_unpack_parameter_dict(
342342
namespace=full_param_name + PARAMETER_SEPARATOR_STRING,
343343
parameter_dict=param_value))

rclpy/test/test_logging_rosout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_enable_rosout(
8383

8484
if expected_data:
8585
assert (rosout_subscription_msg is not None)
86-
assert (type(rosout_subscription_msg) == Log)
86+
assert (isinstance(rosout_subscription_msg, Log))
8787
assert (LoggingSeverity(rosout_subscription_msg.level) == LoggingSeverity.INFO)
8888
assert (len(rosout_subscription_msg.msg) != 0)
8989
assert (rosout_subscription_msg.msg == message_data)

0 commit comments

Comments
 (0)