Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace deprecated python 3.8 code and add missing __init__.py files #1053

Merged
merged 2 commits into from
May 3, 2024
Merged

Replace deprecated python 3.8 code and add missing __init__.py files #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6789eb
Replace deprecated python 3.8 code and add missing __init__.py files …
ksuszka Feb 14, 2024
052daa0
Merge branch 'master' into fix-python-modules
glopezdiest May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 srunner/osc2/ast_manager/__init__ .py → srunner/osc2/__init__.py
View file
Open in desktop
glopezdiest marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
Empty file added srunner/osc2/ast_manager/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion srunner/tools/route_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def parse_routes_file(route_filename, single_route_id=''):
scenario_config.name = scenario.attrib.get('name')
scenario_config.type = scenario.attrib.get('type')

for elem in scenario.getchildren():
for elem in list(scenario):
if elem.tag == 'trigger_point':
scenario_config.trigger_points.append(convert_elem_to_transform(elem))
elif elem.tag == 'other_actor':
Expand Down
2 changes: 1 addition & 1 deletion srunner/tools/scenario_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def parse_scenario_configuration(scenario_name, additional_config_file_name):
config.name = scenario_config_name
config.type = scenario_config_type

for elem in scenario.getchildren():
for elem in list(scenario):
# Elements with special parsing
if elem.tag == 'ego_vehicle':
config.ego_vehicles.append(ActorConfigurationData.parse_from_node(elem, 'hero'))
Expand Down
Loading