fix for Django 1.5 for json serialization

croach · Apr 11, 2013 · 8b56e34 · 8b56e34
1 parent 49b609c
commit 8b56e34
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/simple_rest/utils/serializers.py b/simple_rest/utils/serializers.py
@@ -42,7 +42,11 @@ def to_json(content, indent=None):
         json_serializer = serializers.get_serializer('json')()
         serialized_content = json_serializer.serialize(content, ensure_ascii=False, indent=indent)
     else:
-        serialized_content = json.dumps(content, cls=DecimalEncoder, ensure_ascii=False, indent=indent)
+        try:
+            serialized_content = json.dumps(content, cls=DecimalEncoder, ensure_ascii=False, indent=indent)
+        except TypeError:
+            # Fix for Django 1.5
+            serialized_content = json.dumps(content, ensure_ascii=False, indent=indent)
     return serialized_content