Skip to content

Commit 9190111

Browse files
committed
updated requirements
refactored usage of all render_to_response calls to be compatible with Django 1.11
1 parent 5a4fbc9 commit 9190111

File tree

11 files changed

+123
-165
lines changed

11 files changed

+123
-165
lines changed

readthedocs/bookmarks/views.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
"""Views for the bookmarks app."""
22

33
from __future__ import absolute_import
4+
5+
import json
6+
47
from django.contrib.auth.decorators import login_required
8+
from django.core.exceptions import ObjectDoesNotExist
9+
from django.core.urlresolvers import reverse
510
from django.http import HttpResponse, HttpResponseRedirect
611
from django.http import HttpResponseBadRequest
7-
from django.shortcuts import get_object_or_404, render_to_response
8-
from django.views.generic import ListView, View
9-
from django.core.urlresolvers import reverse
10-
from django.template import RequestContext
12+
from django.shortcuts import get_object_or_404, render
1113
from django.utils.decorators import method_decorator
12-
from django.core.exceptions import ObjectDoesNotExist
1314
from django.views.decorators.csrf import csrf_exempt
14-
import json
15+
from django.views.generic import ListView, View
1516

1617
from readthedocs.bookmarks.models import Bookmark
1718
from readthedocs.projects.models import Project
@@ -161,10 +162,7 @@ def dispatch(self, request, *args, **kwargs):
161162
return super(BookmarkRemoveView, self).dispatch(request, *args, **kwargs)
162163

163164
def get(self, request, *args, **kwargs):
164-
return render_to_response(
165-
'bookmarks/bookmark_delete.html',
166-
context_instance=RequestContext(request)
167-
)
165+
return render(request, 'bookmarks/bookmark_delete.html')
168166

169167
def post(self, request, *args, **kwargs):
170168
"""

readthedocs/comments/views.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import absolute_import
44
from django.contrib.auth.decorators import login_required
5-
from django.shortcuts import render_to_response
5+
from django.shortcuts import render
66
from django.template import RequestContext
77
from django.utils.decorators import method_decorator
88
from rest_framework import permissions, status
@@ -92,9 +92,7 @@ def build(request): # pylint: disable=unused-argument
9292
def serve_file(request, file): # pylint: disable=redefined-builtin
9393
document = support.get_document(file)
9494

95-
return render_to_response('doc.html',
96-
{'document': document},
97-
context_instance=RequestContext(request))
95+
return render(request, 'doc.html', {'document': document})
9896

9997
######
10098
# Called by Builder

readthedocs/core/views/__init__.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from django.conf import settings
1515
from django.http import HttpResponseRedirect, Http404
16-
from django.shortcuts import render_to_response, get_object_or_404, redirect
16+
from django.shortcuts import render, get_object_or_404, redirect
1717
from django.template import RequestContext
1818
from django.views.decorators.csrf import csrf_exempt
1919
from django.views.generic import TemplateView
@@ -98,8 +98,7 @@ def wipe_version(request, project_slug, version_slug):
9898
for del_dir in del_dirs:
9999
broadcast(type='build', task=remove_dir, args=[del_dir])
100100
return redirect('project_version_list', project_slug)
101-
return render_to_response('wipe_version.html',
102-
context_instance=RequestContext(request))
101+
return render(request, 'wipe_version.html')
103102

104103

105104
def divide_by_zero(request): # pylint: disable=unused-argument
@@ -108,8 +107,7 @@ def divide_by_zero(request): # pylint: disable=unused-argument
108107

109108
def server_error_500(request, exception, template_name='500.html'): # pylint: disable=unused-argument # noqa
110109
"""A simple 500 handler so we get media"""
111-
r = render_to_response(template_name,
112-
context_instance=RequestContext(request))
110+
r = render(request, template_name)
113111
r.status_code = 500
114112
return r
115113

@@ -119,7 +117,6 @@ def server_error_404(request, exception, template_name='404.html'): # pylint: d
119117
response = get_redirect_response(request, path=request.get_full_path())
120118
if response:
121119
return response
122-
r = render_to_response(template_name,
123-
context_instance=RequestContext(request))
120+
r = render(request, template_name)
124121
r.status_code = 404
125122
return r

readthedocs/core/views/serve.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from __future__ import absolute_import
2828
from django.conf import settings
2929
from django.http import HttpResponse, HttpResponseRedirect, Http404
30-
from django.shortcuts import render_to_response
30+
from django.shortcuts import render
3131
from django.template import RequestContext
3232
from django.views.static import serve
3333

@@ -109,8 +109,7 @@ def redirect_page_with_filename(request, project, subproject, filename): # pyli
109109

110110

111111
def _serve_401(request, project):
112-
res = render_to_response('401.html',
113-
context_instance=RequestContext(request))
112+
res = render(request, '401.html')
114113
res.status_code = 401
115114
log.error('Unauthorized access to {0} documentation'.format(project.slug))
116115
return res

readthedocs/gold/views.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.contrib.messages.views import SuccessMessageMixin
77
from django.contrib import messages
88
from django.http import HttpResponseRedirect
9-
from django.shortcuts import render_to_response, get_object_or_404
9+
from django.shortcuts import render, get_object_or_404
1010
from django.template import RequestContext
1111
from django.contrib.auth.decorators import login_required
1212
from django.utils.translation import ugettext_lazy as _
@@ -106,17 +106,13 @@ def projects(request):
106106
else:
107107
form = GoldProjectForm()
108108

109-
return render_to_response(
110-
'gold/projects.html',
111-
{
112-
'form': form,
113-
'gold_user': gold_user,
114-
'publishable': settings.STRIPE_PUBLISHABLE,
115-
'user': request.user,
116-
'projects': gold_projects
117-
},
118-
context_instance=RequestContext(request)
119-
)
109+
return render(request, 'gold/projects.html', {
110+
'form': form,
111+
'gold_user': gold_user,
112+
'publishable': settings.STRIPE_PUBLISHABLE,
113+
'user': request.user,
114+
'projects': gold_projects
115+
})
120116

121117

122118
@login_required

readthedocs/profiles/views.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from django.http import Http404
1212
from django.http import HttpResponseRedirect
1313
from django.shortcuts import get_object_or_404, render, redirect
14-
from django.shortcuts import render_to_response
14+
from django.shortcuts import render
1515
from django.template import RequestContext
1616

1717
from readthedocs.core.forms import UserDeleteForm
@@ -103,9 +103,7 @@ def create_profile(request, form_class, success_url=None,
103103
for key, value in list(extra_context.items()):
104104
context[key] = (value() if callable(value) else value)
105105

106-
return render_to_response(template_name,
107-
{'form': form},
108-
context_instance=context)
106+
return render(request, template_name, {'form': form})
109107
create_profile = login_required(create_profile)
110108

111109

@@ -180,11 +178,11 @@ def edit_profile(request, form_class, success_url=None,
180178
for key, value in list(extra_context.items()):
181179
context[key] = (value() if callable(value) else value)
182180

183-
return render_to_response(template_name, {
181+
return render(request, template_name, {
184182
'form': form,
185183
'profile': profile_obj,
186184
'user': profile_obj.user,
187-
}, context_instance=context)
185+
})
188186
edit_profile = login_required(edit_profile)
189187

190188

@@ -273,6 +271,4 @@ def profile_detail(request, username, public_profile_field=None,
273271
for key, value in list(extra_context.items()):
274272
context[key] = (value() if callable(value) else value)
275273

276-
return render_to_response(template_name,
277-
{'profile': profile_obj},
278-
context_instance=context)
274+
return render(request, template_name, {'profile': profile_obj})

readthedocs/projects/views/private.py

+26-31
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,10 @@ def project_versions(request, project_slug):
152152
project_dashboard = reverse('projects_detail', args=[project.slug])
153153
return HttpResponseRedirect(project_dashboard)
154154

155-
return render_to_response(
156-
'projects/project_versions.html',
157-
{'form': form, 'project': project},
158-
context_instance=RequestContext(request)
159-
)
155+
return render(request, 'projects/project_versions.html', {
156+
'form': form,
157+
'project': project,
158+
})
160159

161160

162161
@login_required
@@ -469,11 +468,11 @@ def project_users(request, project_slug):
469468

470469
users = project.users.all()
471470

472-
return render_to_response(
473-
'projects/project_users.html',
474-
{'form': form, 'project': project, 'users': users},
475-
context_instance=RequestContext(request)
476-
)
471+
return render(request, 'projects/project_users.html', {
472+
'form': form,
473+
'project': project,
474+
'users': users
475+
})
477476

478477

479478
@login_required
@@ -510,17 +509,13 @@ def project_notifications(request, project_slug):
510509
emails = project.emailhook_notifications.all()
511510
urls = project.webhook_notifications.all()
512511

513-
return render_to_response(
514-
'projects/project_notifications.html',
515-
{
516-
'email_form': email_form,
517-
'webhook_form': webhook_form,
518-
'project': project,
519-
'emails': emails,
520-
'urls': urls,
521-
},
522-
context_instance=RequestContext(request)
523-
)
512+
return render(request, 'projects/project_notifications.html', {
513+
'email_form': email_form,
514+
'webhook_form': webhook_form,
515+
'project': project,
516+
'emails': emails,
517+
'urls': urls,
518+
})
524519

525520

526521
@login_required
@@ -570,11 +565,11 @@ def project_translations(request, project_slug):
570565

571566
lang_projects = project.translations.all()
572567

573-
return render_to_response(
574-
'projects/project_translations.html',
575-
{'form': form, 'project': project, 'lang_projects': lang_projects},
576-
context_instance=RequestContext(request)
577-
)
568+
return render(request, 'projects/project_translations.html', {
569+
'form': form,
570+
'project': project,
571+
'lang_projects': lang_projects
572+
})
578573

579574

580575
@login_required
@@ -601,11 +596,11 @@ def project_redirects(request, project_slug):
601596

602597
redirects = project.redirects.all()
603598

604-
return render_to_response(
605-
'projects/project_redirects.html',
606-
{'form': form, 'project': project, 'redirects': redirects},
607-
context_instance=RequestContext(request)
608-
)
599+
return render(request, 'projects/project_redirects.html', {
600+
'form': form,
601+
'project': project,
602+
'redirects': redirects
603+
})
609604

610605

611606
@login_required

0 commit comments

Comments
 (0)