Skip to content
Open
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
6 changes: 3 additions & 3 deletions fastjsonschema/draft04.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re

from .exceptions import JsonSchemaDefinitionException
from .generator import CodeGenerator, enforce_list
from .generator import CodeGenerator, enforce_list, repr_default


JSON_TYPE_TO_PYTHON_TYPE = {
Expand Down Expand Up @@ -459,7 +459,7 @@ def generate_items(self):
'{}[{}]'.format(self._variable_name, idx),
)
if self._use_default and isinstance(item_definition, dict) and 'default' in item_definition:
self.l('else: {variable}.append({})', repr(item_definition['default']))
self.l('else: {variable}.append({})', repr_default(item_definition['default']))

if 'additionalItems' in self._definition:
if self._definition['additionalItems'] is False:
Expand Down Expand Up @@ -558,7 +558,7 @@ def generate_properties(self):
clear_variables=True,
)
if self._use_default and isinstance(prop_definition, dict) and 'default' in prop_definition:
self.l('else: {variable}["{}"] = {}', self.e(key), repr(prop_definition['default']))
self.l('else: {variable}["{}"] = {}', self.e(key), repr_default(prop_definition['default']))

def generate_pattern_properties(self):
"""
Expand Down
23 changes: 22 additions & 1 deletion fastjsonschema/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def exc(self, msg, *args, append_to_msg=None, rule=None):
)
definition = self._expand_refs(self._definition)
definition_rule = self.e(definition.get(rule) if isinstance(definition, dict) else None)
self.l(msg, *args, definition=repr(definition), rule=repr(rule), definition_rule=definition_rule)
self.l(msg, *args, definition=repr_default(definition), rule=repr(rule), definition_rule=definition_rule)

def _expand_refs(self, definition):
if isinstance(definition, list):
Expand Down Expand Up @@ -361,6 +361,27 @@ def serialize_regexes(patterns_dict):
return '{\n ' + ",\n ".join(regex_patterns) + "\n}"


def repr_default(value):
"""
Like ``repr``, but renders non-finite floats as valid Python source.

``repr(float('nan'))`` is ``'nan'``, which is not a name available in the
generated code, so a schema default of NaN or infinity has to be written
out as a ``float(...)`` call instead.
"""
if isinstance(value, float) and (value != value or value in (float('inf'), float('-inf'))):
return "float({!r})".format(str(value))
if isinstance(value, list):
return '[' + ', '.join(repr_default(item) for item in value) + ']'
if isinstance(value, tuple):
return '(' + ''.join(repr_default(item) + ', ' for item in value) + ')'
if isinstance(value, dict):
return '{' + ', '.join(
'{}: {}'.format(repr_default(k), repr_default(v)) for k, v in value.items()
) + '}'
return repr(value)


def repr_regex(regex):
all_flags = ("A", "I", "DEBUG", "L", "M", "S", "X")
flags = " | ".join(f"re.{f}" for f in all_flags if regex.flags & getattr(re, f))
Expand Down
36 changes: 36 additions & 0 deletions tests/test_default.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import math

import pytest

from fastjsonschema import JsonSchemaValueException, validate
Expand Down Expand Up @@ -46,3 +48,37 @@ def test_default_turned_off():
},
}, {}, use_default=False)
assert output == {}


def test_default_non_finite_float():
"""Non-finite float defaults must be generated as valid Python source (#101)."""
output = validate({
'type': 'object',
'properties': {
'a': {'type': 'number', 'default': float('nan')},
'b': {'type': 'number', 'default': float('inf')},
'c': {'type': 'number', 'default': float('-inf')},
},
}, {})
assert math.isnan(output['a'])
assert output['b'] == float('inf')
assert output['c'] == float('-inf')


def test_default_non_finite_float_in_array():
output = validate({
'type': 'array',
'items': [{'type': 'number', 'default': float('nan')}],
}, [])
assert len(output) == 1 and math.isnan(output[0])


def test_default_nested_non_finite_float():
output = validate({
'type': 'object',
'properties': {
'a': {'default': {'x': float('inf'), 'y': [1, float('nan')]}},
},
}, {})
assert output['a']['x'] == float('inf')
assert math.isnan(output['a']['y'][1])