diff --git a/Docs/CHANGELOG.md b/Docs/CHANGELOG.md index c6def0522..fc20e9c74 100644 --- a/Docs/CHANGELOG.md +++ b/Docs/CHANGELOG.md @@ -15,6 +15,7 @@ ## Upcoming * Improvements to the CarlaDataProvider: - Added `spawn_actor` for a blueprint based actor creation similar to `World.spawn_actor` +* Removed SyntaxWarnings in osc2_scenario.py ## CARLA ScenarioRunner 0.9.15 ### :rocket: New Features diff --git a/srunner/scenarios/osc2_scenario.py b/srunner/scenarios/osc2_scenario.py index 39f0fe83b..7f63af543 100644 --- a/srunner/scenarios/osc2_scenario.py +++ b/srunner/scenarios/osc2_scenario.py @@ -512,8 +512,8 @@ def visit_do_directive(self, node: ast_node.DoDirective): def bool_result(self, option): # wait(x < y) @drive_distance Handling of Boolean expressions x < y - expression_value = re.split("\W+", option) - symbol = re.search("\W+", option).group() + expression_value = re.split(r"\W+", option) + symbol = re.search(r"\W+", option).group() if symbol == "<": symbol = operator.lt elif symbol == ">": @@ -1194,10 +1194,10 @@ def visit_identifier_reference(self, node: ast_node.IdentifierReference): if isinstance(para_value, (Physical, float, int)): return para_value para_value = para_value.strip('"') - if re.fullmatch("(^[-]?[0-9]+(\.[0-9]+)?)\s*(\w+)", para_value): + if re.fullmatch(r"(^[-]?[0-9]+(\.[0-9]+)?)\s*(\w+)", para_value): # Regular expression ^[-]?[0-9]+(\.[0-9]+)? matching float # para_value_num = re.findall('^[-]?[0-9]+(\.[0-9]+)?', para_value)[0] - patter = re.compile("(^[-]?[0-9]+[\.[0-9]+]?)\s*(\w+)") + patter = re.compile(r"(^[-]?[0-9]+[\.[0-9]+]?)\s*(\w+)") para_value_num, para_value_unit = patter.match(para_value).groups() if para_value_num.count(".") == 1: return Physical(