Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/cookie.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,22 +197,24 @@ impl FromPyObject<'_, '_> for Cookies {
}

let dict = ob.cast::<PyDict>()?;
dict.iter()
.try_fold(Vec::with_capacity(dict.len()), |mut cookies, (k, v)| {
let cookie = {
let key = k.extract::<PyBackedStr>()?;
let value = v.extract::<PyBackedStr>()?;
let mut cookie = String::with_capacity(key.len() + 1 + value.len());
cookie.push_str(key.as_ref());
cookie.push('=');
cookie.push_str(value.as_ref());
HeaderValue::from_maybe_shared(Bytes::from(cookie)).map_err(Error::from)?
};

cookies.push(cookie);
Ok(cookies)
})
.map(Cookies)
let mut cookie = String::new();
for (k, v) in dict.iter() {
if !cookie.is_empty() {
cookie.push_str("; ");
}
cookie.push_str(k.extract::<PyBackedStr>()?.as_ref());
cookie.push('=');
cookie.push_str(v.extract::<PyBackedStr>()?.as_ref());
}

if cookie.is_empty() {
return Ok(Cookies(Vec::new()));
}

HeaderValue::from_maybe_shared(Bytes::from(cookie))
.map(|cookie| Cookies(vec![cookie]))
.map_err(Error::from)
.map_err(Into::into)
}
}

Expand Down
28 changes: 28 additions & 0 deletions tests/cookie_test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import asyncio

import pytest
import wreq
from wreq.cookie import Cookie
Expand Down Expand Up @@ -247,3 +249,29 @@ async def test_cookie_value_update_from_server():
len(user_id_cookies) == 1
), "Should have exactly one user_id cookie after update"
assert user_id_cookies[0].value == "updated_value"


@pytest.mark.asyncio
async def test_cookie_dict_sends_one_header():
requests = asyncio.Queue()

async def handle(reader, writer):
requests.put_nowait(await reader.readuntil(b"\r\n\r\n"))
writer.write(
b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
)
await writer.drain()
writer.close()

server = await asyncio.start_server(handle, "127.0.0.1", 0)
url = f"http://127.0.0.1:{server.sockets[0].getsockname()[1]}/"
try:
resp = await client.get(url, cookies={"a": "1", "b": "2"})
await resp.close()
head = (await asyncio.wait_for(requests.get(), 5)).decode().lower()
finally:
server.close()
await server.wait_closed()

cookies = [line for line in head.split("\r\n") if line.startswith("cookie:")]
assert cookies == ["cookie: a=1; b=2"]