Skip to content

D
django-rest-framework
Commit da1db34a by Tom Christie
Options

Handle UUID objects in JSONEncoder. Closes #2433.

parent b3a0a279
Showing with 3 additions and 0 deletions
rest_framework/utils/encoders.py
...@@ -12,6 +12,7 @@ import datetime ...@@ -12,6 +12,7 @@ import datetime
import decimal import decimal
import types import types
import json import json
import uuid
class JSONEncoder(json.JSONEncoder): class JSONEncoder(json.JSONEncoder):
...@@ -45,6 +46,8 @@ class JSONEncoder(json.JSONEncoder): ...@@ -45,6 +46,8 @@ class JSONEncoder(json.JSONEncoder):
elif isinstance(obj, decimal.Decimal): elif isinstance(obj, decimal.Decimal):
# Serializers will coerce decimals to strings by default. # Serializers will coerce decimals to strings by default.
return float(obj) return float(obj)
elif isinstance(obj, uuid.UUID):
return six.text_type(obj)
elif isinstance(obj, QuerySet): elif isinstance(obj, QuerySet):
return tuple(obj) return tuple(obj)
elif hasattr(obj, 'tolist'): elif hasattr(obj, 'tolist'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment