Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Fix #1349 Skipkeys when serializing to json #1350

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
10 changes: 8 additions & 2 deletions raven/utils/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import json

from .basic import is_namedtuple
from .compat import PY2


try:
Expand Down Expand Up @@ -56,11 +57,16 @@ def better_decoder(data):


def dumps(value, **kwargs):
kwargs['skipkeys'] = True
try:
return json.dumps(value, cls=BetterJSONEncoder, **kwargs)
except Exception:
kwargs['encoding'] = 'safe-utf-8'
return json.dumps(value, cls=BetterJSONEncoder, **kwargs)
if PY2:
# 'encoding' is only available in Py2
kwargs['encoding'] = 'safe-utf-8'
return json.dumps(value, cls=BetterJSONEncoder, **kwargs)
else:
raise


def loads(value, **kwargs):
Expand Down