Skip to content

django.conf.urls.defaults and django.utils.simplejson are deprecated #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

django.conf.urls.defaults and django.utils.simplejson are deprecated #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aa7441
django.conf.urls.defaults is deprecated
stefanocrosta Jul 8, 2013
798d124
django.utils.simplejson is deprecated
stefanocrosta Jul 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion profiler/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
7 changes: 5 additions & 2 deletions profiler/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down