Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop URL(allow_relative=bool) #1073

Merged
merged 5 commits into from
Jul 23, 2020
Merged

Drop URL(allow_relative=bool) #1073

merged 5 commits into from
Jul 23, 2020

Conversation

tomchristie
Copy link
Member

This PR pushes all url.scheme and url.host checking down into the ._transport_for_url method.

This allows us to drop the allow_relative flag on the URL class, and instead just always allow relative URLs, up until the point that we're looking up a transport instance, at which point we enforce HTTP/HTTPS.

There are two benefits here...

  • allow_relative=... wasn't really ever intended as a bit of public API, we just happened to be relying on it ourselves. It's cleaner for our API for allow eg httpx.URL("") as a valid relative URL, without having to explicitly enable it. But we do still want to raise an error if you attempt to issue a request with it.
  • This change is a necessary pre-requisite for Supporting alternate schemes. #954, since we don't necessarily want to hard-code enforce http/https schemes only, once we support mounting other scheme types too. Dropping the enforcement logic into the transport lookup means we'll be able to instead error if there's no appropriately mounted transport.

@tomchristie tomchristie added the refactor Issues and PRs related to code refactoring label Jul 20, 2020
Copy link
Member

@florimondmanca florimondmanca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Left a few nit comments.

httpx/_models.py Outdated Show resolved Hide resolved
Comment on lines +25 to +32
def test_get_invalid_url(server):
with httpx.Client() as client:
with pytest.raises(httpx.InvalidURL):
client.get("invalid://example.org")
with pytest.raises(httpx.InvalidURL):
client.get("://example.org")
with pytest.raises(httpx.InvalidURL):
client.get("http://")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Nit) Considering using a parametrized test style? I enjoy the documentation purpose of id=..., and that each case runs as its own test...

Then should we back-port this to test_async_client.py as well?

Suggested change
def test_get_invalid_url(server):
with httpx.Client() as client:
with pytest.raises(httpx.InvalidURL):
client.get("invalid://example.org")
with pytest.raises(httpx.InvalidURL):
client.get("://example.org")
with pytest.raises(httpx.InvalidURL):
client.get("http://")
@pytest.mark.parametrize(
"url",
[
pytest.param("invalid://example.org", id="scheme-not-http(s)"),
pytest.param("://example.org", id="no-scheme"),
pytest.param("http://", id="no-host"),
],
)
def test_get_invalid_url(server, url):
with httpx.Client() as client:
with pytest.raises(httpx.InvalidURL):
client.get(url)

tests/client/test_async_client.py Show resolved Hide resolved
tomchristie and others added 3 commits July 23, 2020 09:45
@tomchristie tomchristie merged commit 7e6e351 into master Jul 23, 2020
@tomchristie tomchristie deleted the drop-allow-relative branch July 23, 2020 09:16
This was referenced Jul 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Issues and PRs related to code refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants