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

Show file tree
Hide file tree
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
Work around 2.x/3.x json.dumps() return type fuzziness
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Sep 28, 2015
commit ec8098b7e2b69e51c1a3196c20d11b253f914926
6 changes: 5 additions & 1 deletion rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,11 @@ def to_internal_value(self, data):

def to_representation(self, value):
if self.binary:
return json.dumps(value)
value = json.dumps(value)
# On python 2.x the return type for json.dumps() is underspecified.
# On python 3.x json.dumps() returns unicode strings.
if isinstance(value, six.text_type):
value = bytes(value.encode('utf-8'))
return value


Expand Down
4 changes: 2 additions & 2 deletions tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ class TestBinaryJSONField(FieldValues):
Values for `JSONField` with binary=True.
"""
valid_inputs = [
('{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
(b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
'a': 1,
'b': ['some', 'list', True, 1.23],
'3': None
Expand All @@ -1576,7 +1576,7 @@ class TestBinaryJSONField(FieldValues):
'a': 1,
'b': ['some', 'list', True, 1.23],
'3': None
}, '{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
}, b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
]
field = serializers.JSONField(binary=True)

Expand Down