aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Hudson2008-09-20 13:46:44 -0700
committerRob Hudson2008-09-20 13:46:44 -0700
commit251a7f4eb5efaf6339edd57021e5ce3d53a679b3 (patch)
tree962b2f6dcd8689a92f9694b96015951a56e7b39e
parent0c2c0ab82d6f848b6083a176f301d72d8bb798d8 (diff)
downloaddjango-debug-toolbar-251a7f4eb5efaf6339edd57021e5ce3d53a679b3.tar.bz2
Import simplejson from django rather than an external dependency.
-rw-r--r--debug_toolbar/panels/sql.py2
-rw-r--r--debug_toolbar/views.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 757505a..cdcbd1b 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -1,9 +1,9 @@
-import simplejson
import time
from debug_toolbar.panels import DebugPanel
from django.db import connection
from django.db.backends import util
from django.template.loader import render_to_string
+from django.utils import simplejson
class DatabaseStatTracker(util.CursorDebugWrapper):
"""
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 1b44ed1..97739e6 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -5,11 +5,11 @@ views in any other way is generally not advised.
"""
import os
-import simplejson
import django.views.static
from django.conf import settings
from django.db import connection
from django.shortcuts import render_to_response
+from django.utils import simplejson
def debug_media(request, path):
root = getattr(settings, 'DEBUG_TOOLBAR_MEDIA_ROOT', None)