From 5aa74411c007bf809982262acb1acc031b5092a6 Mon Sep 17 00:00:00 2001 From: Stefano Crosta Date: Mon, 8 Jul 2013 12:26:21 +0200 Subject: [PATCH 1/2] django.conf.urls.defaults is deprecated Safely try importing django.conf.urls first, django.conf.urls.defaults later. --- profiler/urls.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/profiler/urls.py b/profiler/urls.py index 07f3b7f..65b48df 100644 --- a/profiler/urls.py +++ b/profiler/urls.py @@ -1,4 +1,7 @@ -from django.conf.urls.defaults import * +try: + from django.conf.urls import patterns, include, url +except ImportError: + from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns( 'profiler.views', From 798d12483ce650977d2f0763a2885dd43ea712bb Mon Sep 17 00:00:00 2001 From: Stefano Crosta Date: Mon, 8 Jul 2013 12:36:56 +0200 Subject: [PATCH 2/2] django.utils.simplejson is deprecated Try importing json first, safely fallback to simplejson. Please beware of some minor incompatibilities in particular with serialization: https://docs.djangoproject.com/en/dev/releases/1.5/#system-version-of-simplejson-no-longer-used --- profiler/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/profiler/views.py b/profiler/views.py index 150f3ba..c6613cb 100644 --- a/profiler/views.py +++ b/profiler/views.py @@ -4,7 +4,10 @@ from django.core.cache import cache from django.contrib.auth.decorators import user_passes_test from django.core.urlresolvers import reverse -from django.utils import simplejson +try: + import json +except ImportError: + from django.utils import simplejson as json from aggregate.client import get_client @@ -42,7 +45,7 @@ def stats_by_view(request): return render_to_response('profiler/by_view.html', {'queries' : grouped, - 'stats' :simplejson.dumps(stats)}, + 'stats' : json.dumps(stats)}, context_instance=RequestContext(request)) @user_passes_test(lambda u:u.is_superuser)