From 5484d570cb8214c776273b45320e7d1c73b85a34 Mon Sep 17 00:00:00 2001
From: Fabien Bochu
Date: Mon, 19 Jan 2015 10:57:26 +0100
Subject: Fix timedelta JSON serialization on Python 2.6.

---
 rest_framework/utils/encoders.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/utils')

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 73cbe5d8..104343a4 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -6,7 +6,7 @@ from django.db.models.query import QuerySet
 from django.utils import six, timezone
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
-from rest_framework.compat import OrderedDict
+from rest_framework.compat import OrderedDict, total_seconds
 from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 import datetime
 import decimal
@@ -41,7 +41,7 @@ class JSONEncoder(json.JSONEncoder):
                 representation = representation[:12]
             return representation
         elif isinstance(obj, datetime.timedelta):
-            return six.text_type(obj.total_seconds())
+            return six.text_type(total_seconds(obj))
         elif isinstance(obj, decimal.Decimal):
             # Serializers will coerce decimals to strings by default.
             return float(obj)
-- 
cgit v1.2.3


From da1db34a36f6f0cb8722acbbf7c3182e32995ae3 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 19 Jan 2015 14:18:02 +0000
Subject: Handle UUID objects in JSONEncoder. Closes #2433.

---
 rest_framework/utils/encoders.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'rest_framework/utils')

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'):
-- 
cgit v1.2.3


From 0dffc46cb71ec868cdbb37187ba03dea7bac4e7a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 19 Jan 2015 14:21:09 +0000
Subject: ReturnDict and ReturnList repr as standard dict/list. Closes #2421.

---
 rest_framework/utils/serializer_helpers.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'rest_framework/utils')

diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py
index 65a04d06..f9960603 100644
--- a/rest_framework/utils/serializer_helpers.py
+++ b/rest_framework/utils/serializer_helpers.py
@@ -16,6 +16,9 @@ class ReturnDict(OrderedDict):
     def copy(self):
         return ReturnDict(self, serializer=self.serializer)
 
+    def __repr__(self):
+        return dict.__repr__(self)
+
 
 class ReturnList(list):
     """
@@ -27,6 +30,9 @@ class ReturnList(list):
         self.serializer = kwargs.pop('serializer')
         super(ReturnList, self).__init__(*args, **kwargs)
 
+    def __repr__(self):
+        return list.__repr__(self)
+
 
 class BoundField(object):
     """
-- 
cgit v1.2.3