2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

use DjangoJSONEncoder in api html preview

Browse source
This commit is contained in:
Laura Klünder 2017-11-30 01:03:28 +01:00
parent f45cf00cd0
commit 2d292844d6
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/mapdata/utils/json.py
View file

@ -1,20 +1,22 @@
import json import json
from collections import OrderedDict from collections import OrderedDict
from django.core.serializers.json import DjangoJSONEncoder
def _preencode(data, magic_marker, in_coords=False, in_groups=False): def _preencode(data, magic_marker, in_coords=False, in_groups=False):
if isinstance(data, dict): if isinstance(data, dict):
data = data.copy() data = data.copy()
for name, value in tuple(data.items()): for name, value in tuple(data.items()):
if name in ('bounds', 'point', 'locations') and isinstance(value, (tuple, list)): if name in ('bounds', 'point', 'locations') and isinstance(value, (tuple, list)):
data[name] = magic_marker+json.dumps(value)+magic_marker data[name] = magic_marker+json.dumps(value, cls=DjangoJSONEncoder)+magic_marker
else: else:
data[name] = _preencode(value, magic_marker, data[name] = _preencode(value, magic_marker,
in_coords=(name == 'coordinates'), in_groups=(name == 'groups')) in_coords=(name == 'coordinates'), in_groups=(name == 'groups'))
return data return data
elif isinstance(data, (tuple, list)): elif isinstance(data, (tuple, list)):
if (in_coords and data and isinstance(data[0], (int, float))) or in_groups: if (in_coords and data and isinstance(data[0], (int, float))) or in_groups:
return magic_marker+json.dumps(data)+magic_marker return magic_marker+json.dumps(data, cls=DjangoJSONEncoder)+magic_marker
else: else:
return tuple(_preencode(value, magic_marker, in_coords) for value in data) return tuple(_preencode(value, magic_marker, in_coords) for value in data)
else: else:
@ -23,7 +25,7 @@ def _preencode(data, magic_marker, in_coords=False, in_groups=False):
def json_encoder_reindent(method, data, *args, **kwargs): def json_encoder_reindent(method, data, *args, **kwargs):
magic_marker = '***JSON_MAGIC_MARKER***' magic_marker = '***JSON_MAGIC_MARKER***'
test_encode = json.dumps(data) test_encode = json.dumps(data, cls=DjangoJSONEncoder)
while magic_marker in test_encode: while magic_marker in test_encode:
magic_marker += '*' magic_marker += '*'
result = method(_preencode(data, magic_marker), *args, **kwargs) result = method(_preencode(data, magic_marker), *args, **kwargs)