Use simplejson only as a fallback

Fixes https://bugs.launchpad.net/graphite/+bug/1003073
graphite-project · May 22, 2012 · 6494bf1 · 6494bf1
1 parent c950741
commit 6494bf1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/webapp/graphite/events/views.py b/webapp/graphite/events/views.py
@@ -1,7 +1,10 @@
 import datetime
 import time
 
-import simplejson
+try:
+  import json
+except ImportError:
+  import simplejson as json
 
 from django.http import HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404

diff --git a/webapp/graphite/graphlot/views.py b/webapp/graphite/graphlot/views.py
@@ -3,7 +3,10 @@
 from django.shortcuts import render_to_response
 from django.http import HttpResponse, Http404, HttpResponseBadRequest
 from django.conf import settings
-import simplejson
+try:
+  import json
+except ImportError:
+  import simplejson as json
 
 from graphite.render.views import parseOptions
 from graphite.render.evaluator import evaluateTarget