From b730aec0f46e2b849b3c597bcf1a1bcdc158e415 Mon Sep 17 00:00:00 2001
From: badaud_t
Date: Thu, 17 Oct 2013 01:08:24 +0200
Subject: Fix decimal support with YAMLRenderer

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

(limited to 'rest_framework/utils/encoders.py')

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 7efd5417..35ad206b 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -89,6 +89,9 @@ else:
                     node.flow_style = best_style
             return node
 
+    SafeDumper.add_representer(decimal.Decimal,
+            SafeDumper.represent_decimal)
+
     SafeDumper.add_representer(SortedDict,
             yaml.representer.SafeRepresenter.represent_dict)
     SafeDumper.add_representer(DictWithMetadata,
-- 
cgit v1.2.3


From 263281d71d0425d7bb9b4ebbdf1811ef637ee60a Mon Sep 17 00:00:00 2001
From: Malcolm Box
Date: Thu, 21 Nov 2013 20:09:48 +0000
Subject: Fix issue #1231: JSONEncoder doesn't handle dict-like objects

Check for __getitem__ and then attempt to convert to a dict.
The check for __getitem__ is there as there's no universal way to
check if an object is a mapping type, but this is a likely proxy
---
 rest_framework/utils/encoders.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'rest_framework/utils/encoders.py')

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 35ad206b..22b1ab3d 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -44,6 +44,12 @@ class JSONEncoder(json.JSONEncoder):
             return str(o)
         elif hasattr(o, 'tolist'):
             return o.tolist()
+        elif hasattr(o, '__getitem__'):
+            try:
+                return dict(o)
+            except KeyError:
+                # Couldn't convert to a dict, fall through
+                pass
         elif hasattr(o, '__iter__'):
             return [i for i in o]
         return super(JSONEncoder, self).default(o)
-- 
cgit v1.2.3


From ddd17c69e7abdd70448fa0f2f2a807d600b3391d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 09:24:10 +0000
Subject: Fix compat issues for #1231

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

(limited to 'rest_framework/utils/encoders.py')

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 22b1ab3d..3ac920c6 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -47,8 +47,7 @@ class JSONEncoder(json.JSONEncoder):
         elif hasattr(o, '__getitem__'):
             try:
                 return dict(o)
-            except KeyError:
-                # Couldn't convert to a dict, fall through
+            except:
                 pass
         elif hasattr(o, '__iter__'):
             return [i for i in o]
-- 
cgit v1.2.3