URL.port becomes Optional[int] #1080
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
| @@ -543,10 +543,13 @@ def _transport_for_url(self, url: URL) -> httpcore.SyncHTTPTransport: | |||
| enforce_http_url(url) | |||
|
|
|||
| if self._proxies and not should_not_be_proxied(url): | |||
| is_default_port = (url.scheme == "http" and url.port == 80) or ( | |||
| url.scheme == "https" and url.port == 443 | |||
| default_port = {"http": 80, "https": 443}[url.scheme] | |||
There was a problem hiding this comment.
Should this be a .get() to avoid KeyError: 'ftp'?
Suggested change
| default_port = {"http": 80, "https": 443}[url.scheme] | |
| default_port = {"http": 80, "https": 443}.get(url.scheme) |
There was a problem hiding this comment.
Actually no, because we've called enforce_http_url(url) before doing anything else, so url.scheme will always be http|https here, and default_port will be an int rather than an Optional[int].
(Agree that it's a bit futzy, and I think it'd potentially clean up a bit if we rethought the proxy_keys/mount API.)
httpx/_client.py
Outdated
Comment on lines
548
to
552
| hostname = ( | ||
| f"{url.host}:{default_port}" | ||
| if url.port is None | ||
| else f"{url.host}:{url.port}" | ||
| ) |
There was a problem hiding this comment.
Could this be simplified:
Suggested change
| hostname = ( | |
| f"{url.host}:{default_port}" | |
| if url.port is None | |
| else f"{url.host}:{url.port}" | |
| ) | |
| port = url.port or default_port | |
| hostname = f"{url.host}:{port}" |
httpx/_client.py
Outdated
Comment on lines
1082
to
1088
| default_port = {"http": 80, "https": 443}[url.scheme] | ||
| is_default_port = url.port is None or url.port == default_port | ||
| hostname = ( | ||
| f"{url.host}:{default_port}" | ||
| if url.port is None | ||
| else f"{url.host}:{url.port}" | ||
| ) |
There was a problem hiding this comment.
Same comments as above
| @@ -273,12 +273,20 @@ def enforce_http_url(url: "URL") -> None: | |||
| raise InvalidURL('URL scheme must be "http" or "https".') | |||
|
|
|||
|
|
|||
| def port_or_default(url: "URL") -> typing.Optional[int]: | |||
There was a problem hiding this comment.
Maybe this should be used above?
florimondmanca
approved these changes
Jul 24, 2020
Merged
Merged
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.
This PR changes
URL.portfrominttoOptional[int].Previously any non http/https URL without an explicit port component would raise an error if
url.portwas accessed.Now
url.portis optional, and only returns any explicitly included port in the URL, without also trying to use a scheme-default if one is not present.This is important because...
URL('ftp://www.example.com').port == Nonewhich makes more sense thanKeyError("ftp")._transport_for_url, rather than at any point in the codebase that accessesurl.port.(Yes, it's a little bit fiddly)