Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion ping/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from django.conf.urls.defaults import patterns, include, url
try: # django.conf.urls.defaults was removed in django 1.6
from django.conf.urls.defaults import patterns, include, url
except:
from django.conf.urls import patterns, include, url

from ping.views import status

urlpatterns = patterns('',
Expand Down
8 changes: 4 additions & 4 deletions ping/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.http import HttpResponse
from django.conf import settings
from django.utils import simplejson
import json
from django.contrib.auth.decorators import login_required
from django.views.decorators.csrf import csrf_exempt

Expand Down Expand Up @@ -28,11 +28,11 @@ def status(request):

if request.GET.get('fmt') == 'json':
try:
response = simplejson.dumps(response_dict)
response = json.dumps(response_dict)
except UnboundLocalError:
response_dict = checks(request)
response = simplejson.dumps(response_dict)
response = simplejson.dumps(response_dict, sort_keys=True)
response = json.dumps(response_dict)
response = json.dumps(response_dict, sort_keys=True)
mimetype = 'application/json'

return HttpResponse(response, mimetype=mimetype, status=200)