Visitar URL original
Fix parse_mode flags without native or NaN number modes by ryanduguid · Pull Request #243 · python-rapidjson/python-rapidjson · GitHub
Skip to content

Fix parse_mode flags without native or NaN number modes #243

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

Open
ryanduguid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix parse_mode flags without native or NaN number modes #243

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
7 changes: 6 additions & 1 deletion rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,12 +2029,17 @@ static PyTypeObject Decoder_Type = {
if (parseMode & PM_COMMENTS) { \
r.Parse<f | \
kParseCommentsFlag | \
kParseNumbersAsStringsFlag>(s, h); \
kParseNumbersAsStringsFlag | \
kParseTrailingCommasFlag>(s, h); \
} else { \
r.Parse<f | \
kParseNumbersAsStringsFlag | \
kParseTrailingCommasFlag>(s, h); \
} \
} else if (parseMode & PM_COMMENTS) { \
r.Parse<f | \
kParseNumbersAsStringsFlag | \
kParseCommentsFlag>(s, h); \
} else { \
r.Parse<f | kParseNumbersAsStringsFlag>(s, h); \
} \
Expand Down
52 changes: 52 additions & 0 deletions tests/test_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from calendar import timegm
from datetime import date, datetime, time, timezone, timedelta
from decimal import Decimal
import io
import math
import uuid
Expand Down Expand Up @@ -156,6 +157,57 @@ def test_parse_mode(dumps, loads):
assert loads(c_and_tc, parse_mode=rj.PM_COMMENTS | rj.PM_TRAILING_COMMAS) == expected


@pytest.mark.parametrize('number_mode', [None, rj.NM_NONE, rj.NM_DECIMAL])
@pytest.mark.parametrize('parse_mode', [
rj.PM_NONE, rj.PM_COMMENTS, rj.PM_TRAILING_COMMAS,
rj.PM_COMMENTS | rj.PM_TRAILING_COMMAS,
])
def test_parse_mode_without_nan(loads, number_mode, parse_mode):
documents = [
(rj.PM_NONE,
'[0.123456789123456789,{"integer":1208925819614629174706177}]'),
(rj.PM_COMMENTS,
'/* start */[0.123456789123456789,// fraction\n'
'{"integer":1208925819614629174706177/* integer */}]/* end */'),
(rj.PM_TRAILING_COMMAS,
'[0.123456789123456789,{"integer":1208925819614629174706177,},]'),
(rj.PM_COMMENTS | rj.PM_TRAILING_COMMAS,
'/* start */[0.123456789123456789,// fraction\n'
'{"integer":1208925819614629174706177/* integer */,},]/* end */'),
]
options = {'number_mode': number_mode, 'parse_mode': parse_mode}
number_type = Decimal if number_mode == rj.NM_DECIMAL else float
for required_mode, document in documents:
if parse_mode & required_mode == required_mode:
result = loads(document, **options)
assert result == [number_type('0.123456789123456789'),
{'integer': 2**80 + 1}]
assert type(result[0]) is number_type
assert type(result[1]['integer']) is int
else:
with pytest.raises(rj.JSONDecodeError):
loads(document, **options)

for document in ('[NaN]', '[Infinity]', '[-Infinity]', '[1.5,,2]',
'[1.5 2]', '{unquoted:1}', '[1.5] /* unterminated',
'[1.5] [2]'):
with pytest.raises(rj.JSONDecodeError):
loads(document, **options)
assert loads('["/* text */","// text"]', **options) == ['/* text */', '// text']


@pytest.mark.parametrize('parse_mode,document', [
(rj.PM_COMMENTS, '/* comment */[1.5]'),
(rj.PM_TRAILING_COMMAS, '[1.5,]'),
(rj.PM_COMMENTS | rj.PM_TRAILING_COMMAS, '/* comment */[1.5,]'),
])
def test_parse_mode_with_allow_nan_false(parse_mode, document):
assert rj.loads(document, allow_nan=False, parse_mode=parse_mode) == [1.5]
assert rj.load(io.StringIO(document), allow_nan=False, parse_mode=parse_mode) == [1.5]
assert rj.load(io.BytesIO(document.encode()), allow_nan=False,
parse_mode=parse_mode) == [1.5]


def test_indent(dumps):
o = {"a": 1, "z": 2, "b": 3}
expected1 = '{\n "a": 1,\n "z": 2,\n "b": 3\n}'
Expand Down
Loading