Fix faulty rstrip in module loading #31108
Merged
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.
Our module loading code uses
.rstrip(".py")
to remove the python file suffix if present, but this is incorrect, because it actually removes any number of characters in the list[".", "p", "y"]
from the end of the filename, resulting in an error if the filename ends inp
ory
:Python has a proper method for doing what we want here, which is
.removesuffix()
, but it was only added in 3.9, and we still need to support 3.8. Instead, I just do it by hand.Fixes #31061