Skip to content
Merged
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
8 changes: 4 additions & 4 deletions src/client/body/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ use serde::{
pub enum Json {
Object(IndexMap<JsonString, Json>),
Boolean(bool),
Number(isize),
Number(i64),
UInt(u64),
Float(f64),
String(JsonString),
Null(Option<isize>),
Expand Down Expand Up @@ -92,13 +93,12 @@ impl<'de> Visitor<'de> for JsonVisitor {
Ok(Json::Boolean(v))
}

// Integers outside `isize` become floats, as the untagged variant order did.
fn visit_i64<E: Error>(self, v: i64) -> Result<Json, E> {
Ok(isize::try_from(v).map_or(Json::Float(v as f64), Json::Number))
Ok(Json::Number(v))
}

fn visit_u64<E: Error>(self, v: u64) -> Result<Json, E> {
Ok(isize::try_from(v).map_or(Json::Float(v as f64), Json::Number))
Ok(i64::try_from(v).map_or(Json::UInt(v), Json::Number))
}

fn visit_f64<E: Error>(self, v: f64) -> Result<Json, E> {
Expand Down
6 changes: 4 additions & 2 deletions src/client/param.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ pub enum Params {
#[derive(FromPyObject)]
pub enum ParamValue {
Boolean(bool),
Number(isize),
Number(i64),
UInt(u64),
Float64(f64),
String(PyBackedStr),
}
Expand All @@ -30,7 +31,8 @@ impl Serialize for ParamValue {
{
match self {
ParamValue::String(s) => serializer.serialize_str(s.as_ref()),
ParamValue::Number(n) => serializer.serialize_i64(*n as i64),
ParamValue::Number(n) => serializer.serialize_i64(*n),
ParamValue::UInt(n) => serializer.serialize_u64(*n),
ParamValue::Float64(f) => serializer.serialize_f64(*f),
ParamValue::Boolean(b) => serializer.serialize_bool(*b),
}
Expand Down
41 changes: 41 additions & 0 deletions tests/request_test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import asyncio

import pytest
import wreq
from wreq import Version
Expand Down Expand Up @@ -205,3 +207,42 @@ def file_to_bytes_stream(file_path):
async with resp:
json = await resp.json()
assert json["data"] in open("README.md").read()


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

async def handle(reader, writer):
head = await reader.readuntil(b"\r\n\r\n")
length = next(
(
int(line.split(b":")[1])
for line in head.split(b"\r\n")
if line.lower().startswith(b"content-length:")
),
0,
)
requests.put_nowait(
head.split(b" ")[1] + b" " + await reader.readexactly(length)
)
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:
await (await client.post(url, json={"a": 2**63, "b": -(2**63)})).close()
await (await client.get(url, query={"a": 2**64 - 1})).close()
sent = [await asyncio.wait_for(requests.get(), 5) for _ in range(2)]
finally:
server.close()
await server.wait_closed()

assert sent == [
b'/ {"a":9223372036854775808,"b":-9223372036854775808}',
b"/?a=18446744073709551615 ",
]
5 changes: 2 additions & 3 deletions tests/response_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ async def test_context_exit_keeps_connection_but_close_forbids_reuse():
assert connections.empty()


# 2**63 overflows `isize`, so it decodes as a float.
JSON_ITEM = {"n": [0, -2, 1.5, 2**63, True, None], "s": "\u00e9\n", "o": {}}
JSON_ITEM = {"n": [0, -2, 1.5, 2**63, -(2**63), True, None], "s": "\u00e9\n", "o": {}}


@pytest.mark.asyncio
Expand Down Expand Up @@ -192,7 +191,7 @@ def read_blocking(url):
assert await asyncio.wait_for(task, 5) == reads

assert reads == ([JSON_ITEM] * count, payload.decode(), payload)
assert isinstance(value[0]["n"][3], float)
assert isinstance(value[0]["n"][3], int)


@pytest.mark.asyncio
Expand Down
Loading