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')

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