Skip to content

Added JSONField. #3454

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

Merged
lovelydinosaur merged 4 commits into from
Sep 28, 2015
Merged

Added JSONField. #3454

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10dbf13
Added JSONField. Closes #3170.
lovelydinosaur Sep 28, 2015
ec8098b
Work around 2.x/3.x json.dumps() return type fuzziness
lovelydinosaur Sep 28, 2015
dad207d
Don't attempt to test dicts (unordered)
lovelydinosaur Sep 28, 2015
265ec8a
Handle binary or unicode with JSONField
lovelydinosaur Sep 28, 2015
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
Prev Previous commit
Next Next commit
Don't attempt to test dicts (unordered)
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Sep 28, 2015
commit dad207de6687fc5d9fd32b47d64932f0982617a7
6 changes: 1 addition & 5 deletions tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1572,11 +1572,7 @@ class TestBinaryJSONField(FieldValues):
('{"a": "unterminated string}', ['Value must be valid JSON.']),
]
outputs = [
({
'a': 1,
'b': ['some', 'list', True, 1.23],
'3': None
}, b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
(['some', 'list', True, 1.23], b'["some", "list", true, 1.23]'),
]
field = serializers.JSONField(binary=True)

Expand Down