Skip to content

Commit

Permalink
Add raw_path to scope in ASGITransport (#1357)
Browse files Browse the repository at this point in the history
* Add raw_path to scope in ASGITransport, closes #1356

* Tweaked test
  • Loading branch information
simonw authored Oct 9, 2020
1 parent 92ca4d0 commit ca5f524
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions httpx/_transports/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ async def arequest(
"headers": [(k.lower(), v) for (k, v) in headers],
"scheme": scheme.decode("ascii"),
"path": unquote(path.decode("ascii")),
"raw_path": path,
"query_string": query,
"server": (host.decode("ascii"), port),
"client": self.client,
Expand Down
19 changes: 19 additions & 0 deletions tests/test_asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ async def echo_path(scope, receive, send):
await send({"type": "http.response.body", "body": output})


async def echo_raw_path(scope, receive, send):
status = 200
output = json.dumps({"raw_path": scope["raw_path"].decode("ascii")}).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")]
Expand Down Expand Up @@ -80,6 +89,16 @@ async def test_asgi_urlencoded_path():
assert response.json() == {"path": "/[email protected]"}


@pytest.mark.usefixtures("async_environment")
async def test_asgi_raw_path():
async with httpx.AsyncClient(app=echo_raw_path) as client:
url = httpx.URL("http://www.example.org/").copy_with(path="/[email protected]")
response = await client.get(url)

assert response.status_code == 200
assert response.json() == {"raw_path": "/user%40example.org"}


@pytest.mark.usefixtures("async_environment")
async def test_asgi_upload():
async with httpx.AsyncClient(app=echo_body) as client:
Expand Down

0 comments on commit ca5f524

Please sign in to comment.