Fix --custom-typeshed-dir crash caused by #13155
#13296
Merged
Conversation
This file contains hidden or 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 comment has been minimized.
This comment has been minimized.
AlexWaygood
changed the title
--custom-typeshed-dir crash caused by #13155
AlexWaygood
commented
Jul 31, 2022
This comment has been minimized.
This comment has been minimized.
1 similar comment
|
According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉 |
code-of-kpp
reviewed
Aug 1, 2022
| @@ -674,6 +674,7 @@ def __init__( | |||
| if options.custom_typeshed_dir is not None: | |||
| # Check if module lives under custom_typeshed_dir subtree | |||
| custom_typeshed_dir = os.path.abspath(options.custom_typeshed_dir) | |||
| path = os.path.abspath(path) | |||
| if os.path.commonpath((path, custom_typeshed_dir)) == custom_typeshed_dir: | |||
There was a problem hiding this comment.
I believe it still can through ValueError on Windows if path and custom_typeshed_dir live on different drives.
There was a problem hiding this comment.
Good point (though I'm tempted to say that anybody trying to do that deserves what they're getting!)
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.
Description
This seems to fix #13295.
Test Plan
I manually verified that this fixes #13295.
Not sure how or where to add a test.I also added a test case totest-data/unit/cmdline.testwhich reproduces the crash onmaster, but passes with this patch applied.