osc2_scenario: Fix SyntaxWarnings #1122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes warnings like the one below:
.../srunner/scenarios/osc2_scenario.py:515: SyntaxWarning: invalid escape sequence '\W'
expression_value = re.split("\W+", option)
Daraan
approved these changes
Oct 20, 2024
Daraan
reviewed
Mar 27, 2025
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @wentasah)
glopezdiest
approved these changes
Mar 27, 2025
There was a problem hiding this comment.
Reviewed 1 of 2 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status:
Daraan
pushed a commit
to Daraan/scenario_runner
that referenced
this pull request
Mar 27, 2025
This fixes warnings like the one below:
.../srunner/scenarios/osc2_scenario.py:515: SyntaxWarning: invalid escape sequence '\W'
expression_value = re.split("\W+", option)
Co-authored-by: glopezdiest <[email protected]>
glopezdiest
added a commit
that referenced
this pull request
Mar 31, 2025
* upgraded version checking to fix deprecation warnings Removed usage of pgk_resources and distutils.version.LooseVersion * Code cleanup 1 Ruff E,W, defalts * Check return statement --ignore F405,F403,F401,RET504,RET505 --exclude tests/ --select E,W,R,PIE,R * flake8-bugbear * remove full width comma * Simplify code with SIM * remove double defined function * fix too long lines * Unnecessary lambda and unnecessary else if * parameterless super() minor changes * Whitespace and other E,W fixes * Add docstring to CDP methods - minor lint fixes * Avoid unbound Name Error * Solve most atomic behavior warnings * further formatting remove extra lines (#1074) Add misc type default blueprint (#1064) Co-authored-by: Pablo Villanueva-Domingo <[email protected]> Fix: wrong initial transform when using request_new_batch_actors (#1068) (#1075) See: #1068 Co-authored-by: Daraan <[email protected]> Update atomic_trigger_conditions.py (#946) In the StandStill() class, change the EPSILON, 0.001 Implement variable frame rate (#1005) Replaced class variable frame_rate with an argument provided on the CLI. Co-authored-by: glopezdiest <[email protected]> Workflow improvements and code quality passing (#1052) * CI: Checkout v4 and unit tests name correction * Small tweaks to ensure Code Quality passes --------- Co-authored-by: glopezdiest <[email protected]> Fixed metrics wheel parser (#1076) Co-authored-by: glopezdiest <[email protected]> [Feature] Blueprint-based spawn_actor function for CarlaDataProvider (#1071) * blueprint-based spawn_actor function for CDP * Auto-Option to decide tracking * Updated changelog * spawned actors are tracked if they are Vehicle | Walker * Updated spawn_actor description --------- Co-authored-by: glopezdiest <[email protected]> Hotfix: missing AttachmentType in the carla mock module for unittest (#1077) * blueprint-based spawn_actor function for CDP * Auto-Option to decide tracking * Updated changelog * spawned actors are tracked if they are Vehicle | Walker * Updated spawn_actor description * Added missing AttachmentType for carla mock --------- Co-authored-by: glopezdiest <[email protected]> Backward compatible upgrade to fix deprecation warnings concerning LooseVersion and pkg_resources for Python3.8+ (#1058) * upgraded version checking to fix deprecation warnings Removed usage of pgk_resources and distutils.version.LooseVersion * < python3.8 backward compatible version checking * Compacter version checking. --------- Co-authored-by: glopezdiest <[email protected]> Replace deprecated python 3.8 code and add missing __init__.py files for proper python module recognition (#1053) Co-authored-by: glopezdiest <[email protected]> add support for scientific notation parsing while running OpenSCENARIO files (#1023) Co-authored-by: glopezdiest <[email protected]> Update osc2_scenario_configuration.py (#1040) Add super.__init__() to class OSC2ScenarioConfiguration to prevent error "AttributeError: 'OSC2ScenarioConfiguration' object has no attribute 'route'" when running scenario_runner.py with --openscenario2 parameter Co-authored-by: glopezdiest <[email protected]> Remove version redundancy (#1081) Update minimum CARLA version to 0.9.14 (#1082) * Remove version redundancy * Merge branch 'master' of https://github.com/carla-simulator/scenario_runner * Update minimum CARLA version Type-hint comments for CarlaDataProvider (#1066) * Type-hint comments for CarlaDataProvider * Suppress Any import warning * Removed None values, increased type-coverage Added log agent [fix]rename compound_symbol.py (#1089) Fixed a typo in openscenario_parser.py (#1118) * Fixed a typo There was a typo in function "get_traffic_light_from_osc_name", which was accessing "CCarlaDataProvider" insted of "CarlaDataProvider". * Delete the unneeded file Fix: Remove duplicate clean method calls (#1096) * [fix]rename compound_symbol.py * [fix]Remove duplicate clean method calls * Fix Atomic_behaviors AddActor Func No return status Link documentation in README (#1129) Include 0.9.14 carla release as compatible with scenario runner 0.9.13 (#1130) * Link documentation in README * Include 0.9.14 carla release as compatible with scenario runner 0.9.13 * Merge branch 'master' into docs_in_readme Added a missing element to the blackboard (#1141) Co-authored-by: glopezdiest <[email protected]> Replaced deprecated is_intersection with is_junction (#1114) Co-authored-by: glopezdiest <[email protected]> CDP request_new_actor new optional argument. (#1113) spawn_point can be ommited when random_location=True Co-authored-by: glopezdiest <[email protected]> Faster information retrieval if actor key is present (#1098) Co-authored-by: glopezdiest <[email protected]> Don't depend on distutils (#1121) distutils are no longer available in Python 3.12. Therefore, we copy the strtobool function from distutils to our own module. This is in line with https://peps.python.org/pep-0632/#migration-advice. Co-authored-by: glopezdiest <[email protected]> Fix dead actor accumulation in CDP (#1091) * Slightly more informative function Returns bool if actor was in the pool, else otherwise * Fix accumulation of dead actors in CDP actor pool * Dead actor cleaning in CDP._actor_*_maps --------- Co-authored-by: glopezdiest <[email protected]> * osc2_scenario: Fix SyntaxWarnings (#1122) This fixes warnings like the one below: .../srunner/scenarios/osc2_scenario.py:515: SyntaxWarning: invalid escape sequence '\W' expression_value = re.split("\W+", option) Co-authored-by: glopezdiest <[email protected]> * formatting * Return iterable * fix: missing import, docstring, explicit return * style: unnecessary super * style: import order * fix | ignore further infractions * some more formatting * define method in init * less general Exception also formatting --------- Co-authored-by: glopezdiest <[email protected]> Co-authored-by: Michal Sojka <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist:
masterbranch and tested with latest changesDescription
This fixes warnings like the one below:
These were introduced in Python 3.12. See https://docs.python.org/3.12/reference/lexical_analysis.html#escape-sequences.
Where has this been tested?
Possible Drawbacks
Hopefully none. r-strings are available even in Python 2.6, so this should work even with older Python versions.
This change is