From 251a7f4eb5efaf6339edd57021e5ce3d53a679b3 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sat, 20 Sep 2008 13:46:44 -0700
Subject: Import simplejson from django rather than an external dependency.

---
 debug_toolbar/panels/sql.py | 2 +-
 debug_toolbar/views.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar')

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)
-- 
cgit v1.2.3