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
5 changes: 4 additions & 1 deletion queue_job/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ def default(self, obj):
}
elif isinstance(obj, lazy):
return obj._value
return json.JSONEncoder.default(self, obj)
try:
return json.JSONEncoder.default(self, obj)
except TypeError:
return None


class JobDecoder(json.JSONDecoder):
Expand Down
12 changes: 12 additions & 0 deletions queue_job/tests/test_json_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,18 @@ def test_decoder_date(self):
value = json.loads(value_json, cls=JobDecoder, env=self.env)
self.assertEqual(value, expected)

def test_encoder_object(self):
value = [object()]
value_json = json.dumps(value, cls=JobEncoder)
expected = [None]
self.assertEqual(json.loads(value_json), expected)

def test_decoder_object(self):
value_json = "[null]"
expected = [None]
value = json.loads(value_json, cls=JobDecoder, env=self.env)
self.assertEqual(value, expected)

def test_encoder_etree(self):
etree_el = etree.Element("root", attr="val")
etree_el.append(etree.Element("child", attr="val"))
Expand Down
Loading