Django 1.9: Removed additional instances of deprecated django.conf.urls.patterns()
- Legacy-Id: 12623
This commit is contained in:
Henrik Levkowetz
parent
eb5aa9a691
commit
5cc3b6448e
|
|
@ -1,21 +1,21 @@
|
|||
# Copyright The IETF Trust 2007, All Rights Reserved
|
||||
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
from django.views.generic import RedirectView
|
||||
from django.http import HttpResponsePermanentRedirect
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
||||
from ietf.group.models import Group
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(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<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/', permanent=True)),
|
||||
(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
|
||||
(r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
|
||||
(r'^wg/(?P<acronym>[^/]+)/$', 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)),
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),
|
||||
url(r'^all/$', RedirectView.as_view(url='/doc/all/', permanent=True)),
|
||||
url(r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc', permanent=True)),
|
||||
url(r'^dead/$', RedirectView.as_view(url='/doc/all/#expired', permanent=True)),
|
||||
url(r'^current/$', RedirectView.as_view(url='/doc/active/', permanent=True)),
|
||||
url(r'^(?P<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/', permanent=True)),
|
||||
url(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
|
||||
url(r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
|
||||
url(r'^wg/(?P<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/', permanent=True)),
|
||||
url(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt', permanent=True)),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
from django.views.generic import RedirectView
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(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<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/', permanent=True)),
|
||||
(r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
|
||||
(r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/', permanent=True)),
|
||||
(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/', permanent=True)),
|
||||
url(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html', permanent=True)),
|
||||
url(r'^status/$', RedirectView.as_view(url='/doc/iesg/', permanent=True)),
|
||||
url(r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/', permanent=True)),
|
||||
url(r'^rfc0*(?P<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/', permanent=True)),
|
||||
url(r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
|
||||
url(r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/', permanent=True)),
|
||||
url(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
from django.conf.urls import patterns
|
||||
from django.views.generic import RedirectView
|
||||
from django.conf import settings
|
||||
|
||||
|
|
@ -8,16 +7,16 @@ from ietf.iesg.feeds import IESGAgendaFeed
|
|||
from ietf.ipr.feeds import LatestIprDisclosuresFeed
|
||||
from ietf.liaisons.feeds import LiaisonStatementsFeed
|
||||
from ietf.meeting.feeds import LatestMeetingMaterialFeed
|
||||
from ietf.utils.urls import url
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
(r'^comments/(?P<remainder>.*)/$', 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()),
|
||||
(r'^iesg-agenda/$', IESGAgendaFeed()),
|
||||
(r'^ipr/$', LatestIprDisclosuresFeed()),
|
||||
(r'^liaison/(?P<kind>recent|from|to|subject)/(?:(?P<search>[^/]+)/)?$', LiaisonStatementsFeed()),
|
||||
(r'^wg-proceedings/$', LatestMeetingMaterialFeed()),
|
||||
(r'^rfc/$', RfcFeed())
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r'^comments/(?P<remainder>.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/', permanent=True)),
|
||||
url(r'^document-changes/%(name)s/$' % settings.URL_REGEXPS, DocumentChangesFeed()),
|
||||
url(r'^last-call/$', InLastCallFeed()),
|
||||
url(r'^group-changes/%(acronym)s/$' % settings.URL_REGEXPS, GroupChangesFeed()),
|
||||
url(r'^iesg-agenda/$', IESGAgendaFeed()),
|
||||
url(r'^ipr/$', LatestIprDisclosuresFeed()),
|
||||
url(r'^liaison/(?P<kind>recent|from|to|subject)/(?:(?P<search>[^/]+)/)?$', LiaisonStatementsFeed()),
|
||||
url(r'^wg-proceedings/$', LatestMeetingMaterialFeed()),
|
||||
url(r'^rfc/$', RfcFeed())
|
||||
]
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class GroupAdmin(admin.ModelAdmin):
|
|||
|
||||
# SDO reminder
|
||||
def get_urls(self):
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
def wrap(view):
|
||||
def wrapper(*args, **kwargs):
|
||||
|
|
@ -51,10 +51,10 @@ class GroupAdmin(admin.ModelAdmin):
|
|||
|
||||
info = self.model._meta.app_label, self.model._meta.model_name
|
||||
|
||||
urls = patterns('',
|
||||
urls = [
|
||||
url(r'^reminder/$', wrap(self.send_reminder), name='%s_%s_reminder' % info),
|
||||
url(r'^(.+)/reminder/$', wrap(self.send_one_reminder), name='%s_%s_one_reminder' % info),
|
||||
)
|
||||
]
|
||||
urls += super(GroupAdmin, self).get_urls()
|
||||
return urls
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
from django.views.generic import RedirectView
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^nomcom/$', RedirectView.as_view(url="/nomcom/ann/", permanent=True)),
|
||||
(r'^nomcom/(?P<message_id>\d+)/$', RedirectView.as_view(url="/nomcom/ann/%(message_id)s/", permanent=True)),
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r'^nomcom/$', RedirectView.as_view(url="/nomcom/ann/", permanent=True)),
|
||||
url(r'^nomcom/(?P<message_id>\d+)/$', RedirectView.as_view(url="/nomcom/ann/%(message_id)s/", permanent=True)),
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue