Browse files

Merge pull request #8 from treyhunner/fix-json-in-django-1.5

Use Python built-in json (avoids a Django 1.5 bug)
  • Loading branch information...
2 parents 8c1d4b4 + 2d1c26f commit 9ac2ae284b76efb3c50a1c2899f383a27154cb54 @zbyte64 committed Apr 18, 2013
Showing with 3 additions and 1 deletion.
  1. +3 −1 hyperadmin/mediatypes/collectionjson.py
View
4 hyperadmin/mediatypes/collectionjson.py
@@ -1,4 +1,6 @@
-from django.utils import simplejson as json
+from __future__ import absolute_import
+
+import json
from django import http
from hyperadmin.mediatypes.encoders import HyperadminJSONEncoder, force_text

0 comments on commit 9ac2ae2

Please sign in to comment.