encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 16:24:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle binary or unicode with JSONField

Browse Source
This commit is contained in:
Tom Christie 2015-09-28 17:47:51 +01:00
parent dad207de66
commit 265ec8ac62
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api-guide/fields.md
View File

@ -461,7 +461,7 @@ You can also use the declarative style, as with `ListField`. For example:
## JSONField ## JSONField
A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON encoded strings. A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON-encoded binary strings.
**Signature**: `JSONField(binary)` **Signature**: `JSONField(binary)`

2
rest_framework/fields.py
View File

@ -1535,6 +1535,8 @@ class JSONField(Field):
def to_internal_value(self, data): def to_internal_value(self, data):
try: try:
if self.binary: if self.binary:
if isinstance(data, six.binary_type):
data = data.decode('utf-8')
return json.loads(data) return json.loads(data)
else: else:
json.dumps(data) json.dumps(data)