diff options
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/utils/encoders.py | 3 | 
1 files changed, 3 insertions, 0 deletions
| diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 104343a4..bf753271 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -12,6 +12,7 @@ import datetime  import decimal  import types  import json +import uuid  class JSONEncoder(json.JSONEncoder): @@ -45,6 +46,8 @@ class JSONEncoder(json.JSONEncoder):          elif isinstance(obj, decimal.Decimal):              # Serializers will coerce decimals to strings by default.              return float(obj) +        elif isinstance(obj, uuid.UUID): +            return six.text_type(obj)          elif isinstance(obj, QuerySet):              return tuple(obj)          elif hasattr(obj, 'tolist'): | 
