diff --git a/httpx/_transports/asgi.py b/httpx/_transports/asgi.py index 94976f3aad..b47f68b547 100644 --- a/httpx/_transports/asgi.py +++ b/httpx/_transports/asgi.py @@ -1,4 +1,5 @@ from typing import TYPE_CHECKING, Callable, List, Optional, Tuple, Union +from urllib.parse import unquote import httpcore import sniffio @@ -88,7 +89,7 @@ async def arequest( "method": method.decode(), "headers": headers, "scheme": scheme.decode("ascii"), - "path": path.decode("ascii"), + "path": unquote(path.decode("ascii")), "query_string": query, "server": (host.decode("ascii"), port), "client": self.client, diff --git a/tests/test_asgi.py b/tests/test_asgi.py index 70da3c54ad..4aac735a53 100644 --- a/tests/test_asgi.py +++ b/tests/test_asgi.py @@ -1,3 +1,5 @@ +import json + import pytest import httpx @@ -12,6 +14,15 @@ async def hello_world(scope, receive, send): await send({"type": "http.response.body", "body": output}) +async def echo_path(scope, receive, send): + status = 200 + output = json.dumps({"path": scope["path"]}).encode("utf-8") + headers = [(b"content-type", "text/plain"), (b"content-length", str(len(output)))] + + await send({"type": "http.response.start", "status": status, "headers": headers}) + await send({"type": "http.response.body", "body": output}) + + async def echo_body(scope, receive, send): status = 200 headers = [(b"content-type", "text/plain")] @@ -48,6 +59,16 @@ async def test_asgi(): assert response.text == "Hello, World!" +@pytest.mark.usefixtures("async_environment") +async def test_asgi_urlencoded_path(): + async with httpx.AsyncClient(app=echo_path) as client: + url = httpx.URL("http://www.example.org/").copy_with(path="/user@example.org") + response = await client.get(url) + + assert response.status_code == 200 + assert response.json() == {"path": "/user@example.org"} + + @pytest.mark.usefixtures("async_environment") async def test_asgi_upload(): async with httpx.AsyncClient(app=echo_body) as client: