GH-123599: url2pathname(): handle authority section in file URL#126844
Merged
barneygale merged 26 commits intopython:mainfrom Apr 10, 2025
Merged
GH-123599: url2pathname(): handle authority section in file URL#126844barneygale merged 26 commits intopython:mainfrom
url2pathname(): handle authority section in file URL#126844barneygale merged 26 commits intopython:mainfrom
Conversation
… on POSIX Adjust `urllib.request.url2pathname()` to parse the URL authority and path with `urlsplit()` on POSIX. If the authority is empty or resolves to the current host, it is ignored and the URL path is used as the pathname. If not, we raise `URLError`.
barneygale
changed the title
url2pathname(): handle non-empty authority section on POSIXurl2pathname(): handle non-empty authority section on POSIX
barneygale
changed the title
url2pathname(): handle non-empty authority section on POSIXurl2pathname(): handle authority section on POSIX
barneygale
changed the title
url2pathname(): handle authority section on POSIXurl2pathname(): handle authority section in file URL
AA-Turner
reviewed
Mar 20, 2025
Member
AA-Turner
left a comment
AA-Turner
left a comment
There was a problem hiding this comment.
Two reviews for the price of one!
Co-authored-by: Adam Turner <[email protected]>
Contributor
Author
|
Quick note on timing for this PR and #125866. If possible I'd like to land this PR in time for 3.14 beta 1, in ~6 weeks time. It would mean we restrict backwards-incompatible changes to 3.14, with none planned for 3.15. I think that would be better for users who might be affected by the changes - e.g. folks who previously wrapped the I'll wait until 3.15 before I look at #125866 so I don't overload 3.14. That change will be 100% backwards-compatible. Happy to re-think if anyone is unhappy with this plan. Cheers |
Contributor
Author
Member
serhiy-storchaka
left a comment
serhiy-storchaka
left a comment
There was a problem hiding this comment.
Some changes may be not so innocent:
url2pathname()now performs network requests (and hang for a time).url2pathname()now can raise URLError.- The result of
gethostbyname_ex()andgethostname()is cached. Previously, you could reset this by settingFileHandler.names = None. - There may be a difference in handling authorities with port. It is not covered by tests.
Co-authored-by: Bénédikt Tran <[email protected]>
Contributor
Author
|
Thank you for the reviews!
That seems to be needed per RFC 8089 section 3 (ref) and section 2 less explicitly. And it only comes up if the hostname isn't empty or "localhost" Even so, perhaps we should put the new behaviour behind an argument like
I think this is preferable to returning a nonsense local path, e.g.
Fixed!
I've added the test cases you suggested. |
AA-Turner
reviewed
Apr 9, 2025
Contributor
Author
|
Thank you both :) |
|
This comment was marked as resolved.
This comment was marked as resolved.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
In
urllib.request.url2pathname(), if the authority resolves to the current host, discard it. If an authority is present but resolves somewhere else, then on Windows we return a UNC path (as before), and on other platforms we raiseURLError.Affects
pathlib.Path.from_uri()in the same way.I'm indebted to Eryk Sun for his analysis.
Path.from_uri()doesn't work if the URI contains host component #123599