From ff9b8a9bdb777a3ddd55b1ce903bb746f1b3fcd9 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 15 Dec 2016 13:19:51 +0000 Subject: [PATCH] Deprecation fixes: Explicitly say that redirects are permanent. - Legacy-Id: 12532 --- ietf/doc/redirect_drafts_urls.py | 18 +++++++++--------- ietf/doc/redirect_idtracker_urls.py | 16 ++++++++-------- ietf/feed_urls.py | 2 +- ietf/group/urls_info.py | 10 +++++----- ietf/iesg/urls.py | 6 +++--- ietf/ipr/urls.py | 4 ++-- ietf/liaisons/urls.py | 2 +- ietf/mailinglists/urls.py | 6 +++--- ietf/secr/proceedings/urls.py | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ietf/doc/redirect_drafts_urls.py b/ietf/doc/redirect_drafts_urls.py index b4a85f51a..ee9235703 100644 --- a/ietf/doc/redirect_drafts_urls.py +++ b/ietf/doc/redirect_drafts_urls.py @@ -8,14 +8,14 @@ from django.shortcuts import get_object_or_404 from ietf.group.models import Group urlpatterns = patterns('', - (r'^$', RedirectView.as_view(url='/doc/')), - (r'^all/$', RedirectView.as_view(url='/doc/all/')), - (r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc')), - (r'^dead/$', RedirectView.as_view(url='/doc/all/#expired')), - (r'^current/$', RedirectView.as_view(url='/doc/active/')), - (r'^(?P\d+)/(related/)?$', RedirectView.as_view(url='/doc/')), - (r'^(?P[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/')), + (r'^$', RedirectView.as_view(url='/doc/', permanent=True)), + (r'^all/$', RedirectView.as_view(url='/doc/all/', permanent=True)), + (r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc', permanent=True)), + (r'^dead/$', RedirectView.as_view(url='/doc/all/#expired', permanent=True)), + (r'^current/$', RedirectView.as_view(url='/doc/active/', permanent=True)), + (r'^(?P\d+)/(related/)?$', RedirectView.as_view(url='/doc/', permanent=True)), + (r'^(?P[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)), (r'^wgid/(?P\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)), - (r'^wg/(?P[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')), - (r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt')), + (r'^wg/(?P[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/', permanent=True)), + (r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt', permanent=True)), ) diff --git a/ietf/doc/redirect_idtracker_urls.py b/ietf/doc/redirect_idtracker_urls.py index 3a8e7bc85..dec4823dc 100644 --- a/ietf/doc/redirect_idtracker_urls.py +++ b/ietf/doc/redirect_idtracker_urls.py @@ -2,12 +2,12 @@ from django.conf.urls import patterns from django.views.generic import RedirectView urlpatterns = patterns('', - (r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/')), - (r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html')), - (r'^status/$', RedirectView.as_view(url='/doc/iesg/')), - (r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/')), - (r'^rfc0*(?P\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/')), - (r'^(?P[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/')), - (r'^(?P[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/')), - (r'^$', RedirectView.as_view(url='/doc/')), + (r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/', permanent=True)), + (r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html', permanent=True)), + (r'^status/$', RedirectView.as_view(url='/doc/iesg/', permanent=True)), + (r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/', permanent=True)), + (r'^rfc0*(?P\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/', permanent=True)), + (r'^(?P[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)), + (r'^(?P[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/', permanent=True)), + (r'^$', RedirectView.as_view(url='/doc/', permanent=True)), ) diff --git a/ietf/feed_urls.py b/ietf/feed_urls.py index 6b54b12d3..73016e630 100644 --- a/ietf/feed_urls.py +++ b/ietf/feed_urls.py @@ -11,7 +11,7 @@ from ietf.meeting.feeds import LatestMeetingMaterialFeed urlpatterns = patterns( '', - (r'^comments/(?P.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/')), + (r'^comments/(?P.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/', permanent=True)), (r'^document-changes/%(name)s/$' % settings.URL_REGEXPS, DocumentChangesFeed()), (r'^last-call/$', InLastCallFeed()), (r'^group-changes/%(acronym)s/$' % settings.URL_REGEXPS, GroupChangesFeed()), diff --git a/ietf/group/urls_info.py b/ietf/group/urls_info.py index adf47d60c..977696a23 100644 --- a/ietf/group/urls_info.py +++ b/ietf/group/urls_info.py @@ -8,15 +8,15 @@ from ietf.group import views, views_edit urlpatterns = patterns('', (r'^$', views.active_groups), - (r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')), - (r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')), - (r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt')), + (r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt', permanent=True)), + (r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt', permanent=True)), + (r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt', permanent=True)), (r'^1wg-summary.txt', views.wg_summary_area), (r'^1wg-summary-by-acronym.txt', views.wg_summary_acronym), (r'^1wg-charters.txt', views.wg_charters), (r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym), - (r'^chartering/$', RedirectView.as_view(url='/group/chartering/')), - (r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/')), + (r'^chartering/$', RedirectView.as_view(url='/group/chartering/', permanent=True)), + (r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/', permanent=True)), (r'^bofs/$', views.bofs), (r'^email-aliases/$', 'ietf.group.views.email_aliases'), (r'^bofs/create/$', views_edit.edit, {'action': "create", }, "bof_create"), diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index a24bd58ad..7d4871c28 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -37,9 +37,9 @@ from django.views.generic import RedirectView from django.conf import settings urlpatterns = patterns('', - (r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html')), - (r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True )), - (r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/')), + (r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html', permanent=True)), + (r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True)), + (r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/', permanent=True)), (r'^decisions/(?:(?P[0-9]{4})/)?$', "ietf.iesg.views.review_decisions"), (r'^agenda/(?:%(date)s/)?$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda"), diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py index 80ca1eebc..ad6e8de47 100644 --- a/ietf/ipr/urls.py +++ b/ietf/ipr/urls.py @@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse_lazy urlpatterns = patterns('ietf.ipr.views', url(r'^$', 'showlist', name='ipr_showlist'), (r'^about/$', 'about'), - url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ipr_admin',kwargs={'state':'pending'})),name="ipr_admin_main"), + url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ipr_admin',kwargs={'state':'pending'}), permanent=True),name="ipr_admin_main"), url(r'^admin/(?Ppending|removed|parked)/$', 'admin', name='ipr_admin'), url(r'^ajax/search/$', 'ajax_search', name='ipr_ajax_search'), url(r'^by-draft/$', 'by_draft_txt'), @@ -21,7 +21,7 @@ urlpatterns = patterns('ietf.ipr.views', url(r'^(?P\d+)/notify/(?Pupdate|posted)/$', 'notify', name='ipr_notify'), url(r'^(?P\d+)/post/$', 'post', name='ipr_post'), url(r'^(?P\d+)/state/$', 'state', name='ipr_state'), - (r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'))), + (r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'), permanent=True)), url(r'^update/(?P\d+)/$', 'update', name='ipr_update'), url(r'^new-(?P(specific|generic|third-party))/$', 'new', name='ipr_new'), url(r'^search/$', 'search', name="ipr_search"), diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py index 74a6e70f8..cad76b4c7 100644 --- a/ietf/liaisons/urls.py +++ b/ietf/liaisons/urls.py @@ -8,7 +8,7 @@ urlpatterns = patterns('', url(r'^help/fields/$', TemplateView.as_view(template_name='liaisons/field_help.html'), name='liaisons_field_help'), (r'^help/from_ietf/$', TemplateView.as_view(template_name='liaisons/guide_from_ietf.html')), (r'^help/to_ietf/$', TemplateView.as_view(template_name='liaisons/guide_to_ietf.html')), - (r'^managers/$', RedirectView.as_view(url='https://www.ietf.org/liaison/managers.html')), + (r'^managers/$', RedirectView.as_view(url='https://www.ietf.org/liaison/managers.html', permanent=True)), ) # AJAX views diff --git a/ietf/mailinglists/urls.py b/ietf/mailinglists/urls.py index 3f6af28ca..0528f8f90 100644 --- a/ietf/mailinglists/urls.py +++ b/ietf/mailinglists/urls.py @@ -5,7 +5,7 @@ from django.views.generic import RedirectView urlpatterns = patterns('', (r'^wg/$', 'ietf.mailinglists.views.groups'), - (r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')), - (r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')), - (r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html')), + (r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)), + (r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)), + (r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html', permanent=True)), ) diff --git a/ietf/secr/proceedings/urls.py b/ietf/secr/proceedings/urls.py index d931f8aa8..25705cea1 100644 --- a/ietf/secr/proceedings/urls.py +++ b/ietf/secr/proceedings/urls.py @@ -12,5 +12,5 @@ urlpatterns = patterns('ietf.secr.proceedings.views', url(r'^(?P\d{1,3})/recording/$', 'recording', name='proceedings_recording'), url(r'^(?P\d{1,3})/recording/edit/(?P[A-Za-z0-9_\-\+]+)$', 'recording_edit', name='proceedings_recording_edit'), url(r'^(?P\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS, - OldUploadRedirect.as_view()), + OldUploadRedirect.as_view(permanent=True)), )