Skip to content

Django 1.6 compatibility for views #11

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

Merged
merged 1 commit into from
Oct 13, 2015
Merged

Django 1.6 compatibility for views #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions graphene/contrib/django/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json

from django.http import JsonResponse
from django.http import HttpResponse
from django.views.generic import View
from django.conf import settings

Expand All @@ -25,11 +25,10 @@ def format_result(result):
return data

def response_errors(self, *errors):
return JsonResponse({
"errors": [{
errors = [{
"message": str(e)
} for e in errors]
})
return HttpResponse(json.dumps({'errors': errors}), content_type='application/json')

def execute_query(self, request, query):
if not query:
Expand All @@ -42,7 +41,7 @@ def execute_query(self, request, query):
if settings.DEBUG:
raise e
return self.response_errors(e)
return JsonResponse(data)
return HttpResponse(json.dumps(data), content_type='application/json')

def get(self, request, *args, **kwargs):
query = request.GET.get('query')
Expand Down