Skip to content

Commit d66ac15

Browse files
OleLaursenOleLaursen
committed
Rewrite a bunch of HttpResponseRedirect + url reverse calls to instead
take advantage of the redirect shortcut (introduced in Django 1.1) - Legacy-Id: 6960
1 parent 72e36bd commit d66ac15

File tree

25 files changed

+185
-305
lines changed

25 files changed

+185
-305
lines changed

‎ietf/doc/views_ballot.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import re, os, datetime, json
55

6-
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
7-
from django.shortcuts import render_to_response, get_object_or_404
6+
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
7+
from django.shortcuts import render_to_response, get_object_or_404, redirect
88
from django.core.urlresolvers import reverse as urlreverse
99
from django.template.loader import render_to_string
1010
from django.template import RequestContext
@@ -208,9 +208,9 @@ def edit_position(request, name, ballot_id):
208208
qstr += "&ad=%s" % request.GET.get('ad')
209209
return HttpResponseRedirect(urlreverse("doc_send_ballot_comment", kwargs=dict(name=doc.name, ballot_id=ballot_id)) + qstr)
210210
elif request.POST.get("Defer"):
211-
return HttpResponseRedirect(urlreverse("doc_defer_ballot", kwargs=dict(name=doc)))
211+
return redirect("doc_defer_ballot", name=doc)
212212
elif request.POST.get("Undefer"):
213-
return HttpResponseRedirect(urlreverse("doc_undefer_ballot", kwargs=dict(name=doc)))
213+
return redirect("doc_undefer_ballot", name=doc)
214214
else:
215215
return HttpResponseRedirect(return_to_url)
216216
else:
@@ -331,7 +331,7 @@ def clear_ballot(request, name):
331331
create_ballot_if_not_open(doc, by, t.slug)
332332
if doc.get_state('draft-iesg').slug == 'defer':
333333
do_undefer_ballot(request,doc)
334-
return HttpResponseRedirect(urlreverse("doc_view", kwargs=dict(name=doc.name)))
334+
return redirect("doc_view", name=doc.name)
335335

336336
return render_to_response('doc/ballot/clear_ballot.html',
337337
dict(doc=doc,

‎ietf/doc/views_conflict_review.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def submit(request, name):
156156
review.time = datetime.datetime.now()
157157
review.save()
158158

159-
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': review.name}))
159+
return redirect('doc_view', name=review.name)
160160

161161
elif "reset_text" in request.POST:
162162

@@ -214,7 +214,7 @@ def edit_notices(request, name):
214214
c.desc = "Notification list changed to : "+review.notify
215215
c.save()
216216

217-
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': review.name}))
217+
return redirect('doc_view', name=review.name)
218218

219219
else:
220220

@@ -248,7 +248,7 @@ def edit_ad(request, name):
248248
c.desc = "Shepherding AD changed to "+review.ad.name
249249
c.save()
250250

251-
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': review.name}))
251+
return redirect('doc_view', name=review.name)
252252

253253
else:
254254
init = { "ad" : review.ad_id }

‎ietf/doc/views_doc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ def add_comment(request, name):
760760
if doc.type_id == "draft":
761761
email_ad(request, doc, doc.ad, login,
762762
"A new comment added by %s" % login.name)
763-
return HttpResponseRedirect(urlreverse("doc_history", kwargs=dict(name=doc.name)))
763+
return redirect("doc_history", name=doc.name)
764764
else:
765765
form = AddCommentForm()
766766

‎ietf/doc/views_draft.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from textwrap import dedent
55

66
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
7-
from django.shortcuts import render_to_response, get_object_or_404
7+
from django.shortcuts import render_to_response, get_object_or_404, redirect
88
from django.core.urlresolvers import reverse as urlreverse
99
from django.template.loader import render_to_string
1010
from django.template import RequestContext
@@ -844,7 +844,7 @@ def edit_notices(request, name):
844844
c.desc = "Notification list changed to : "+doc.notify
845845
c.save()
846846

847-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
847+
return redirect('doc_view', name=doc.name)
848848

849849
elif "regenerate_addresses" in request.POST:
850850
init = { "notify" : get_initial_notify(doc) }
@@ -897,7 +897,7 @@ def telechat_date(request, name):
897897

898898
if form.is_valid():
899899
update_telechat(request, doc, login, form.cleaned_data['telechat_date'],form.cleaned_data['returning_item'])
900-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
900+
return redirect('doc_view', name=doc.name)
901901
else:
902902
form = TelechatForm(initial=initial)
903903

@@ -946,7 +946,7 @@ def edit_iesg_note(request, name):
946946
c.desc = log_message
947947
c.save()
948948

949-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
949+
return redirect('doc_view', name=doc.name)
950950
else:
951951
form = IESGNoteForm(initial=initial)
952952

@@ -1001,7 +1001,7 @@ def edit_shepherd_writeup(request, name):
10011001
e.text = writeup
10021002
e.save()
10031003

1004-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
1004+
return redirect('doc_view', name=doc.name)
10051005

10061006
elif "reset_text" in request.POST:
10071007

@@ -1067,7 +1067,7 @@ def edit_shepherd(request, name):
10671067
c.desc = "Document shepherd changed to "+ (doc.shepherd.name if doc.shepherd else "(None)")
10681068
c.save()
10691069

1070-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
1070+
return redirect('doc_view', name=doc.name)
10711071

10721072
else:
10731073
current_shepherd = None
@@ -1115,7 +1115,7 @@ def edit_ad(request, name):
11151115
c.desc = "Shepherding AD changed to "+doc.ad.name
11161116
c.save()
11171117

1118-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
1118+
return redirect('doc_view', name=doc.name)
11191119

11201120
else:
11211121
init = { "ad" : doc.ad_id }
@@ -1154,7 +1154,7 @@ def edit_consensus(request, name):
11541154

11551155
e.save()
11561156

1157-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
1157+
return redirect('doc_view', name=doc.name)
11581158

11591159
else:
11601160
form = ConsensusForm(initial=dict(consensus=nice_consensus(prev_consensus).replace("Unknown", "")))
@@ -1225,7 +1225,7 @@ def request_publication(request, name):
12251225
doc.time = e.time
12261226
doc.save()
12271227

1228-
return HttpResponseRedirect(urlreverse('doc_view', kwargs={'name': doc.name}))
1228+
return redirect('doc_view', name=doc.name)
12291229

12301230
else:
12311231
if doc.intended_std_level_id in ("std", "ds", "ps", "bcp"):

‎ietf/doc/views_search.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from django.shortcuts import render_to_response
3737
from django.db.models import Q
3838
from django.template import RequestContext
39-
from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
39+
from django.http import Http404, HttpResponse, HttpResponseBadRequest
4040

4141
from ietf.doc.expire import expirable_draft
4242
from ietf.utils import normalize_draftname

‎ietf/doc/views_status_change.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from django import forms
44
from django.shortcuts import render_to_response, get_object_or_404, redirect
5-
from django.http import HttpResponseRedirect, Http404
5+
from django.http import Http404, HttpResponseRedirect
66
from django.core.urlresolvers import reverse
77
from django.template import RequestContext
88
from django.template.loader import render_to_string
@@ -158,7 +158,7 @@ def submit(request, name):
158158
doc.time = datetime.datetime.now()
159159
doc.save()
160160

161-
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': doc.name}))
161+
return redirect('doc_view', name=doc.name)
162162

163163
elif "reset_text" in request.POST:
164164

@@ -214,7 +214,7 @@ def edit_notices(request, name):
214214
c.desc = "Notification list changed to : "+status_change.notify
215215
c.save()
216216

217-
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': status_change.name}))
217+
return redirect('doc_view', name=status_change.name)
218218

219219
else:
220220

‎ietf/group/ajax.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import json
55

66
from django.shortcuts import get_object_or_404
7-
from django.http import HttpResponseRedirect, HttpResponse, Http404
7+
from django.http import HttpResponse, Http404
88

99
from dajaxice.core import dajaxice_functions
1010
from dajaxice.decorators import dajaxice_register

‎ietf/liaisons/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def add_liaison(request, liaison=None):
3232
notify_pending_by_email(request, liaison)
3333
else:
3434
send_liaison_by_email(request, liaison)
35-
return HttpResponseRedirect(reverse('liaison_list'))
35+
return redirect('liaison_list')
3636
else:
3737
form = liaison_form_factory(request, liaison=liaison)
3838

‎ietf/meeting/ajax.py‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22

33
from django.core.urlresolvers import reverse
4-
from django.shortcuts import get_object_or_404
4+
from django.shortcuts import get_object_or_404, redirect
55
from django.http import HttpResponseRedirect, HttpResponse, QueryDict
66

77
from dajaxice.decorators import dajaxice_register
@@ -176,12 +176,9 @@ def timeslot_addroom(request, meeting):
176176
newroom.create_timeslots()
177177

178178
if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
179-
url = reverse(timeslot_roomurl, args=[meeting.number, newroom.pk])
180-
#debug.log("Returning timeslot_roomurl: %s " % (url))
181-
return HttpResponseRedirect(url)
179+
return redirect(timeslot_roomurl, meeting.number, newroom.pk)
182180
else:
183-
return HttpResponseRedirect(
184-
reverse(edit_timeslots, args=[meeting.number]))
181+
return redirect(edit_timeslots, meeting.number)
185182

186183
@role_required('Secretariat')
187184
def timeslot_delroom(request, meeting, roomid):
@@ -247,11 +244,9 @@ def timeslot_addslot(request, meeting):
247244
# XXX FIXME: newroom is undefined. Placeholder:
248245
newroom = None
249246
if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
250-
return HttpResponseRedirect(
251-
reverse(timeslot_dayurl, args=[meeting.number, newroom.pk]))
247+
return redirect(timeslot_dayurl, meeting.number, newroom.pk)
252248
else:
253-
return HttpResponseRedirect(
254-
reverse(edit_timeslots, args=[meeting.number]))
249+
return redirect(edit_timeslots, meeting.number)
255250

256251
@role_required('Secretariat')
257252
def timeslot_delslot(request, meeting, slotid):
@@ -314,12 +309,9 @@ def agenda_add(request, meeting):
314309
newagenda.save()
315310

316311
if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
317-
url = reverse(agenda_infourl, args=[meeting.number, newagenda.name])
318-
#debug.log("Returning agenda_infourl: %s " % (url))
319-
return HttpResponseRedirect(url)
312+
return redirect(agenda_infourl, meeting.number, newagenda.name)
320313
else:
321-
return HttpResponseRedirect(
322-
reverse(edit_agenda, args=[meeting.number, newagenda.name]))
314+
return redirect(edit_agenda, meeting.number, newagenda.name)
323315

324316
@role_required('Area Director','Secretariat')
325317
def agenda_update(request, meeting, schedule):
@@ -364,8 +356,7 @@ def agenda_update(request, meeting, schedule):
364356
return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
365357
content_type="application/json")
366358
else:
367-
return HttpResponseRedirect(
368-
reverse(edit_agenda, args=[meeting.number, schedule.name]))
359+
return redirect(edit_agenda, meeting.number, schedule.name)
369360

370361
@role_required('Secretariat')
371362
def agenda_del(request, meeting, schedule):

‎ietf/meeting/views.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from django import forms
1414
from django.shortcuts import render_to_response, get_object_or_404, redirect
15-
from django.http import HttpResponseRedirect, HttpResponse, Http404
15+
from django.http import HttpResponse, Http404
1616
from django.core.urlresolvers import reverse
1717
from django.db.models import Q
1818
from django.template import RequestContext
@@ -117,9 +117,7 @@ def agenda_create(request, num=None, schedule_name=None):
117117
sched = meeting.schedule_set.get(name=savedname, owner=request.user.person)
118118
if sched:
119119
# XXX needs to record a session error and redirect to where?
120-
return HttpResponseRedirect(
121-
reverse(edit_agenda,
122-
args=[meeting.number, sched.name]))
120+
return redirect(edit_agenda, meeting.number, sched.name)
123121

124122
except Schedule.DoesNotExist:
125123
pass
@@ -158,9 +156,7 @@ def agenda_create(request, num=None, schedule_name=None):
158156

159157

160158
# now redirect to this new schedule.
161-
return HttpResponseRedirect(
162-
reverse(edit_agenda,
163-
args=[meeting.number, newschedule.name]))
159+
return redirect(edit_agenda, meeting.number, newschedule.name)
164160

165161

166162
@decorator_from_middleware(GZipMiddleware)

0 commit comments

Comments
 (0)