django-openid-auth

Merge lp:~ricardokirkner/django-openid-auth/django-1.11-compatibility into lp:django-openid-auth

  1. django-1.11-compatibility
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 131
Merge reported by: Otto Co-Pilot
Merged at revision: 129
Proposed branch: lp:~ricardokirkner/django-openid-auth/django-1.11-compatibility
Merge into: lp:django-openid-auth
Diff against target: 69 lines (+16/-9)
2 files modified
django_openid_auth/views.py (+5/-8)
tox.ini (+11/-1)
To merge this branch: bzr merge lp:~ricardokirkner/django-openid-auth/django-1.11-compatibility
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+341478@code.launchpad.net

Commit message

do not use RequestContext anymore

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
lp:~ricardokirkner/django-openid-auth/django-1.11-compatibility updated
131. By Ricardo Kirkner

use render instead of render_to_response

render_to_response started the deprecation cycle on 1.11; it's recommended to use render instead

Revision history for this message
Tom Wardill (twom) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django_openid_auth/views.py'
2--- django_openid_auth/views.py 2017-03-31 17:25:44 +0000
3+++ django_openid_auth/views.py 2018-03-15 18:41:42 +0000
4@@ -43,8 +43,7 @@
5 from django.core.urlresolvers import reverse
6 from django.http import HttpResponse, HttpResponseRedirect
7 from django.http.request import QueryDict
8-from django.shortcuts import render_to_response
9-from django.template import RequestContext
10+from django.shortcuts import render
11 from django.template.loader import render_to_string
12 try:
13 from django.views.decorators.csrf import csrf_exempt
14@@ -133,8 +132,7 @@
15 template_name='openid/failure.html',
16 exception=None):
17 """Render an error page to the user."""
18- context = RequestContext(request)
19- context.update(dict(message=message, exception=exception))
20+ context = dict(message=message, exception=exception)
21 data = render_to_string(template_name, context)
22 return HttpResponse(data, status=status)
23
24@@ -179,12 +177,11 @@
25
26 # Invalid or no form data:
27 if openid_url is None:
28- context = RequestContext(request)
29- context.update({
30+ context = {
31 'form': login_form,
32 redirect_field_name: redirect_to,
33- })
34- return render_to_response(template_name, context)
35+ }
36+ return render(request, template_name, context)
37
38 consumer = make_consumer(request)
39 try:
40
41=== modified file 'tox.ini'
42--- tox.ini 2017-04-03 12:32:54 +0000
43+++ tox.ini 2018-03-15 18:41:42 +0000
44@@ -1,6 +1,6 @@
45 [tox]
46 envlist =
47- py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10,py3-django1.10
48+ py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10,py27-django1.11,py3-django1.10,py3-django1.11
49
50 [testenv]
51 commands = python manage.py test django_openid_auth
52@@ -45,7 +45,17 @@
53 django == 1.10.6
54 {[testenv:py27]deps}
55
56+[testenv:py27-django1.11]
57+deps =
58+ django == 1.11.11
59+ {[testenv:py27]deps}
60+
61 [testenv:py3-django1.10]
62 deps =
63 django == 1.10.6
64 {[testenv:py3]deps}
65+
66+[testenv:py3-django1.11]
67+deps =
68+ django == 1.11.11
69+ {[testenv:py3]deps}

Subscribers

People subscribed via source and target branches