Skip to content

Normalize permitted Decimal NaNs before encoding #255

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.

Sign up for GitHub

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

Merged
lelit merged 1 commit into from
Oct 31, 2026
Merged

Normalize permitted Decimal NaNs before encoding #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Changes
1.26 (unreleased)
~~~~~~~~~~~~~~~~~

* Normalize signed, signaling and payload-bearing Decimal NaNs to the supported
``NaN`` token when non-finite numbers are enabled, so encoded output remains
readable by the decoder.

* Add Windows ARM64 build (`PR #242`__), thanks to Nikhil Dabas

__ https://github.com/python-rapidjson/python-rapidjson/pull/242
Expand Down
13 changes: 13 additions & 0 deletions rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2387,6 +2387,19 @@ dumps_internal(
}
}

if (numberMode & NM_NAN) {
PyObject* is_nan = PyObject_CallMethodObjArgs(object, is_nan_name,
NULL);
if (is_nan == NULL)
return false;
bool nan = is_nan == Py_True;
Py_DECREF(is_nan);
if (nan) {
writer->RawValue("NaN", 3, kNumberType);
return PyErr_Occurred() ? false : true;
}
}

PyObject* decStrObj = PyObject_Str(object);
if (decStrObj == NULL)
return false;
Expand Down
23 changes: 23 additions & 0 deletions tests/test_float.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,29 @@
import rapidjson as rj


@pytest.mark.parametrize('value', [
'NaN', '-NaN', '+NaN', 'sNaN', '-sNaN', '+sNaN', 'NaN123', '-NaN123',
])
@pytest.mark.parametrize('use_encoder', [False, True])
def test_decimal_nan_tokens(value, use_encoder):
number = Decimal(value)
mode = rj.NM_DECIMAL | rj.NM_NAN
encode = rj.Encoder(number_mode=mode) if use_encoder else (
lambda obj: rj.dumps(obj, number_mode=mode)
)
assert encode(number) == 'NaN'
encoded = encode({'value': [number]})
decoded = rj.loads(encoded, number_mode=mode)
assert decoded['value'][0].is_nan()

if use_encoder:
strict_encode = rj.Encoder(number_mode=rj.NM_DECIMAL)
else:
strict_encode = lambda obj: rj.dumps(obj, number_mode=rj.NM_DECIMAL)
with pytest.raises(ValueError, match='Out of range decimal'):
strict_encode(number)


def test_infinity_f():
inf = float("inf")

Expand Down
19 changes: 19 additions & 0 deletions tests/test_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io
import sys
import tempfile
from decimal import Decimal

import pytest

Expand Down Expand Up @@ -89,6 +90,24 @@ def test_underlying_stream_write_error():
rj.dump('1234567890', stream)


@pytest.mark.parametrize('value', [
Decimal('NaN'), Decimal('sNaN'), Decimal('-NaN123'),
Decimal('1.5'), float('nan'),
])
@pytest.mark.parametrize('use_encoder', [False, True])
@pytest.mark.parametrize('nested', [False, True])
def test_nonfinite_closed_stream_error(value, use_encoder, nested):
stream = io.StringIO()
stream.close()
mode = rj.NM_DECIMAL | rj.NM_NAN
datum = [value] if nested else value
with pytest.raises(ValueError, match='I/O operation on closed file'):
if use_encoder:
rj.Encoder(number_mode=mode)(datum, stream=stream)
else:
rj.dump(datum, stream, number_mode=mode)


def test_file_object():
for stream in tempfile.TemporaryFile(), tempfile.TemporaryFile('w+', encoding='utf-8'):
with stream:
Expand Down
Loading