From cfa0d47ca01b9cc6b1ed25a965625f1c3b0bd8c0 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 11 Dec 2013 16:36:09 +0000 Subject: [PATCH] Port to new class-based generic redirect and simple template views, remove utils.lazy.reverse_lazy, it's now included in Django - Legacy-Id: 6878 --- ietf/community/urls.py | 2 +- ietf/cookies/urls.py | 2 +- ietf/dbtemplate/urls.py | 2 +- ietf/doc/redirect_drafts_urls.py | 24 ++++++------- ietf/doc/redirect_idtracker_urls.py | 20 +++++------ ietf/doc/urls.py | 15 +++----- ietf/doc/urls_conflict_review.py | 2 +- ietf/doc/urls_status_change.py | 2 +- ietf/group/admin.py | 2 +- ietf/group/stream_urls.py | 2 +- ietf/group/urls.py | 6 ++-- ietf/help/urls.py | 2 +- ietf/iesg/urls.py | 34 +++++++++--------- ietf/iesg/views.py | 7 ++-- ietf/ietfauth/urls.py | 2 +- ietf/ipr/urls.py | 8 ++--- ietf/liaisons/urls.py | 18 +++++----- ietf/mailinglists/urls.py | 9 ++--- ietf/meeting/urls.py | 12 +++---- ietf/nomcom/redirect_ann_urls.py | 8 ++--- ietf/nomcom/urls.py | 12 ++++--- ietf/person/urls.py | 2 +- ietf/redirects/urls.py | 2 +- ietf/secr/announcement/urls.py | 2 +- ietf/secr/areas/urls.py | 2 +- ietf/secr/console/urls.py | 2 +- ietf/secr/drafts/urls.py | 2 +- ietf/secr/groups/urls.py | 2 +- ietf/secr/ipradmin/urls.py | 6 ++-- ietf/secr/meetings/urls.py | 2 +- ietf/secr/proceedings/urls.py | 2 +- ietf/secr/roles/urls.py | 2 +- ietf/secr/rolodex/urls.py | 2 +- ietf/secr/sreq/urls.py | 2 +- ietf/secr/telechat/urls.py | 2 +- ietf/secr/urls.py | 8 ++--- ietf/submit/urls.py | 2 +- ietf/sync/urls.py | 2 +- ietf/urls.py | 8 ++--- ietf/utils/lazy.py | 20 ----------- ietf/wgcharter/urls.py | 2 +- ietf/wginfo/urls.py | 54 ++++++++++++++--------------- 42 files changed, 145 insertions(+), 174 deletions(-) delete mode 100644 ietf/utils/lazy.py diff --git a/ietf/community/urls.py b/ietf/community/urls.py index 10b9a157a..95d2c4494 100644 --- a/ietf/community/urls.py +++ b/ietf/community/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.community.views', diff --git a/ietf/cookies/urls.py b/ietf/cookies/urls.py index 1cc014947..10ee92629 100644 --- a/ietf/cookies/urls.py +++ b/ietf/cookies/urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2010, All Rights Reserved -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from ietf.cookies import views urlpatterns = patterns('', diff --git a/ietf/dbtemplate/urls.py b/ietf/dbtemplate/urls.py index 47e8cb542..c6e14ff00 100644 --- a/ietf/dbtemplate/urls.py +++ b/ietf/dbtemplate/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.dbtemplate.views', diff --git a/ietf/doc/redirect_drafts_urls.py b/ietf/doc/redirect_drafts_urls.py index fa920a461..fba0479f2 100644 --- a/ietf/doc/redirect_drafts_urls.py +++ b/ietf/doc/redirect_drafts_urls.py @@ -1,23 +1,21 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf import settings -from django.conf.urls.defaults import patterns - - +from django.conf.urls import patterns +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'^$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/'}), - (r'^all/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/'}), - (r'^rfc/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#rfc'}), - (r'^dead/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#expired'}), - (r'^current/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/active/'}), - (r'^(?P\d+)/(related/)?$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/' }), - (r'^(?P[^/]+)/(related/)?$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/%(name)s/' }), + (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'^wgid/(?P\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)), - (r'^wg/(?P[^/]+)/$', 'django.views.generic.simple.redirect_to', { 'url': '/wg/%(acronym)s/' }), - (r'^all_id(?:_txt)?.html$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/id/all_id.txt' }), + (r'^wg/(?P[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')), + (r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='http://www.ietf.org/id/all_id.txt')), ) diff --git a/ietf/doc/redirect_idtracker_urls.py b/ietf/doc/redirect_idtracker_urls.py index ac3eff633..34625339c 100644 --- a/ietf/doc/redirect_idtracker_urls.py +++ b/ietf/doc/redirect_idtracker_urls.py @@ -1,13 +1,13 @@ -from django.conf.urls.defaults import patterns, url -from django.views.generic.simple import redirect_to +from django.conf.urls import patterns, url +from django.views.generic import RedirectView urlpatterns = patterns('', - (r'^help/(?:sub)?state/(?:\d+/)?$', redirect_to, {'url': '/doc/help/state/draft-iesg/' }), - (r'^help/evaluation/$', redirect_to, {'url':'http://www.ietf.org/iesg/voting-procedures.html' }), - (r'^status/$', redirect_to, {'url':'/doc/iesg/' }), - (r'^status/last-call/$', redirect_to, {'url':'/doc/iesg/last-call/' }), - (r'^rfc0*(?P\d+)/$', redirect_to, {'url':'/doc/rfc%(rfc_number)s/' }), - (r'^(?P[^/]+)/$', redirect_to, {'url':'/doc/%(name)s/' }), - (r'^(?P[^/]+)/comment/\d+/$', redirect_to, {'url':'/doc/%(name)s/history/' }), - (r'^$', redirect_to, { 'url': '/doc/'}), + (r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(rl='/doc/help/state/draft-iesg/')), + (r'^help/evaluation/$', RedirectView.as_view(url='http://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/')), ) diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py index 887c4a26f..04184a1cd 100644 --- a/ietf/doc/urls.py +++ b/ietf/doc/urls.py @@ -30,8 +30,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from django.conf.urls.defaults import patterns, url, include -from django.shortcuts import redirect +from django.conf.urls import patterns, url, include +from django.views.generic import RedirectView + from ietf.doc.models import State from ietf.doc import views_search, views_draft, views_ballot from ietf.doc import views_status_change @@ -42,14 +43,8 @@ urlpatterns = patterns('', url(r'^search/$', views_search.search, name="doc_search"), url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"), url(r'^ad/(?P[A-Za-z0-9.-]+)/$', views_search.docs_for_ad, name="docs_for_ad"), -) - -urlpatterns += patterns('django.views.generic.simple', - (r'^ad2/(?P[A-Za-z0-9.-]+)/$', 'redirect_to', {'url': '/doc/ad/%(name)s/', 'permanent': True}), -) - -urlpatterns += patterns('', - url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'), + (r'^ad2/(?P[A-Za-z0-9.-]+)/$', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)), + url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'), url(r'^start-rfc-status-change/(?P[A-Za-z0-9._+-]*)$', views_status_change.start_rfc_status_change, name='start_rfc_status_change'), url(r'^iesg/(?P[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"), diff --git a/ietf/doc/urls_conflict_review.py b/ietf/doc/urls_conflict_review.py index c18dfe7fc..1435f6ac6 100644 --- a/ietf/doc/urls_conflict_review.py +++ b/ietf/doc/urls_conflict_review.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.doc.views_conflict_review', url(r'^state/$', "change_state", name='conflict_review_change_state'), diff --git a/ietf/doc/urls_status_change.py b/ietf/doc/urls_status_change.py index 573835833..e4e23a52c 100644 --- a/ietf/doc/urls_status_change.py +++ b/ietf/doc/urls_status_change.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.doc.views_status_change', url(r'^state/$', "change_state", name='status_change_change_state'), diff --git a/ietf/group/admin.py b/ietf/group/admin.py index ff0040af0..031bc6464 100644 --- a/ietf/group/admin.py +++ b/ietf/group/admin.py @@ -42,7 +42,7 @@ class GroupAdmin(admin.ModelAdmin): # SDO reminder def get_urls(self): - from django.conf.urls.defaults import patterns, url + from django.conf.urls import patterns, url def wrap(view): def wrapper(*args, **kwargs): diff --git a/ietf/group/stream_urls.py b/ietf/group/stream_urls.py index 39fbb7176..743206416 100644 --- a/ietf/group/stream_urls.py +++ b/ietf/group/stream_urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2008, All Rights Reserved -from django.conf.urls.defaults import patterns, include +from django.conf.urls import patterns, include import views_stream diff --git a/ietf/group/urls.py b/ietf/group/urls.py index c20b040a2..4a911a897 100644 --- a/ietf/group/urls.py +++ b/ietf/group/urls.py @@ -1,11 +1,9 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns, url, include -from django.views.generic.simple import redirect_to -from ietf.group import ajax +from django.conf.urls import patterns, url urlpatterns = patterns('', - (r'^(?P[a-z0-9]+).json$', ajax.group_json), + (r'^(?P[a-z0-9]+).json$', 'ietf.group.ajax.group_json'), ) diff --git a/ietf/help/urls.py b/ietf/help/urls.py index 8e6277d0d..8c6f59c69 100644 --- a/ietf/help/urls.py +++ b/ietf/help/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('', url(r'^state/(?P[-\w]+)/(?P[-\w]+)/?$', 'ietf.help.views.state'), diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index 9f0fc6c86..9fe0c11e4 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -32,26 +32,26 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from django.conf import settings -from ietf.iesg import views +from django.views.generic import RedirectView urlpatterns = patterns('', - (r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' }), - (r'^ann/(?:ind|new|prev)/$', 'django.views.generic.simple.redirect_to', { 'url': "/iesg/decisions/", 'permanent': True }), - (r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }), + (r'^telechat/.*$', RedirectView.as_view(url='http://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'^decisions/(?:(?P[0-9]{4})/)?$', views.review_decisions), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?$', views.agenda), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda.txt$', views.agenda_txt), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda.json$', views.agenda_json), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?scribe_template.html$', views.agenda_scribe_template), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?moderator_package.html$', views.agenda_moderator_package), - (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda_package.txt$', views.agenda_package), + (r'^decisions/(?:(?P[0-9]{4})/)?$', "ietf.iesg.views.review_decisions"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?$', "ietf.iesg.views.agenda"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda.txt$', "ietf.iesg.views.agenda_txt"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda.json$', "ietf.iesg.views.agenda_json"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?scribe_template.html$', "ietf.iesg.views.agenda_scribe_template"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?moderator_package.html$', "ietf.iesg.views.agenda_moderator_package"), + (r'^agenda/(?:(?P\d{4}-\d{2}-\d{2})/)?agenda_package.txt$', "ietf.iesg.views.agenda_package"), - (r'^agenda/documents.txt$', views.agenda_documents_txt), - (r'^agenda/documents/$', views.agenda_documents), - (r'^agenda/telechat-(?:(?P\d{4}-\d{2}-\d{2})-)?docs.tgz', views.telechat_docs_tarfile), - (r'^discusses/$', views.discusses), - (r'^milestones/$', views.milestones_needing_review), + (r'^agenda/documents.txt$', "ietf.iesg.views.agenda_documents_txt"), + (r'^agenda/documents/$', "ietf.iesg.views.agenda_documents"), + (r'^agenda/telechat-(?:(?P\d{4}-\d{2}-\d{2})-)?docs.tgz', "ietf.iesg.views.telechat_docs_tarfile"), + (r'^discusses/$', "ietf.iesg.views.discusses"), + (r'^milestones/$', "ietf.iesg.views.milestones_needing_review"), ) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index a241b03cf..7997f11c0 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -36,11 +36,10 @@ import codecs, re, os, glob, datetime import tarfile, StringIO, time import itertools -from django.views.generic.simple import direct_to_template from django.core.urlresolvers import reverse as urlreverse from django.http import Http404, HttpResponse, HttpResponseForbidden, HttpResponseRedirect from django.template import RequestContext, Context, loader -from django.shortcuts import render_to_response, get_object_or_404, redirect +from django.shortcuts import render_to_response, get_object_or_404, render, redirect from django.conf import settings from django.utils import simplejson as json from django.db import models @@ -362,7 +361,7 @@ def agenda_documents(request): "sections": sorted((num, section) for num, section in sections.iteritems() if "2" <= num < "5") }) - return direct_to_template(request, 'iesg/agenda_documents.html', { 'telechats':telechats }) + return render(request, 'iesg/agenda_documents.html', { 'telechats': telechats }) def telechat_docs_tarfile(request, date): date = get_agenda_date(date) @@ -433,7 +432,7 @@ def discusses(request): # latest first docs.sort(key=lambda d: min(p.time for p in d.blocking_positions), reverse=True) - return direct_to_template(request, 'iesg/discusses.html', { 'docs': docs }) + return render(request, 'iesg/discusses.html', { 'docs': docs }) @role_required('Area Director', 'Secretariat') def milestones_needing_review(request): diff --git a/ietf/ietfauth/urls.py b/ietf/ietfauth/urls.py index 4fd239d20..6fd020807 100644 --- a/ietf/ietfauth/urls.py +++ b/ietf/ietfauth/urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2007, 2009, All Rights Reserved -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.ietfauth.views', url(r'^$', 'index', name='account_index'), diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py index e27c38224..5d218e5a0 100644 --- a/ietf/ipr/urls.py +++ b/ietf/ipr/urls.py @@ -1,16 +1,16 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url +from django.core.urlresolvers import reverse_lazy + from ietf.ipr import views, new, search -from ietf.utils.lazy import reverse_lazy -from django.views.generic.simple import redirect_to urlpatterns = patterns('', url(r'^$', views.showlist, name='ipr_showlist'), (r'^about/$', views.about), (r'^by-draft/$', views.iprs_for_drafts_txt), url(r'^(?P\d+)/$', views.show, name='ipr_show'), - (r'^update/$', redirect_to, { 'url': reverse_lazy('ipr_showlist') }), + (r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'))), (r'^update/(?P\d+)/$', new.update), (r'^new-(?Pspecific)/$', new.new), (r'^new-(?Pgeneric)/$', new.new), diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py index f09523884..c941065bd 100644 --- a/ietf/liaisons/urls.py +++ b/ietf/liaisons/urls.py @@ -1,14 +1,14 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns, url -from django.db.models import Q +from django.conf.urls import patterns, url +from django.views.generic import RedirectView,TemplateView -urlpatterns = patterns('django.views.generic.simple', - (r'^help/$', 'direct_to_template', {'template': 'liaisons/help.html'}), - (r'^help/fields/$', 'direct_to_template', {'template': 'liaisons/field_help.html'}), - (r'^help/from_ietf/$', 'direct_to_template', {'template': 'liaisons/guide_from_ietf.html'}), - (r'^help/to_ietf/$', 'direct_to_template', {'template': 'liaisons/guide_to_ietf.html'}), - (r'^managers/$', 'redirect_to', { 'url': 'http://www.ietf.org/liaison/managers.html' }) +urlpatterns = patterns('', + (r'^help/$', TemplateView.as_view(template='liaisons/help.html')), + (r'^help/fields/$', TemplateView.as_view(template='liaisons/field_help.html')), + (r'^help/from_ietf/$', TemplateView.as_view(template='liaisons/guide_from_ietf.html')), + (r'^help/to_ietf/$', TemplateView.as_view(template='liaisons/guide_to_ietf.html')), + (r'^managers/$', RedirectView.as_view(url='http://www.ietf.org/liaison/managers.html')), ) urlpatterns += patterns('ietf.liaisons.views', @@ -18,6 +18,6 @@ urlpatterns += patterns('ietf.liaisons.views', url(r'^for_approval/$', 'liaison_approval_list', name='liaison_approval_list'), url(r'^for_approval/(?P\d+)/$', 'liaison_approval_detail', name='liaison_approval_detail'), url(r'^add/$', 'add_liaison', name='add_liaison'), - url(r'^ajax/get_info/$', 'get_info', name='get_info'), + url(r'^ajax/get_info/$', 'get_info'), url(r'^ajax/liaison_list/$', 'ajax_liaison_list', name='ajax_liaison_list'), ) diff --git a/ietf/mailinglists/urls.py b/ietf/mailinglists/urls.py index 9795b63de..a5c021b9f 100644 --- a/ietf/mailinglists/urls.py +++ b/ietf/mailinglists/urls.py @@ -1,10 +1,11 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns +from django.views.generic import RedirectView urlpatterns = patterns('', (r'^wg/$', 'ietf.mailinglists.views.groups'), - (r'^nonwg/$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/list/nonwg.html'}), - (r'^nonwg/update/$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/list/nonwg.html'}), - (r'^request/$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/list/request.html' }), + (r'^nonwg/$', RedirectView.as_view(url='http://www.ietf.org/list/nonwg.html')), + (r'^nonwg/update/$', RedirectView.as_view(url='http://www.ietf.org/list/nonwg.html')), + (r'^request/$', RedirectView.as_view(url='http://www.ietf.org/list/request.html')), ) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index afc07960e..57cf3deb4 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -1,17 +1,17 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns, url, include -from django.views.generic.simple import redirect_to +from django.conf.urls import patterns, url, include +from django.views.generic import RedirectView from ietf.meeting import views from ietf.meeting import ajax urlpatterns = patterns('', (r'^(?P\d+)/materials.html$', views.materials), - (r'^agenda/$', views.agenda), + (r'^agenda/$', views.agenda), (r'^(?Pagenda-utc)(?P.html)?$', views.agenda), (r'^agenda(?P.html)?$', views.agenda), (r'^agenda/edit$', views.edit_agenda), - (r'^requests.html$', redirect_to, {"url": '/meeting/requests', "permanent": True}), + (r'^requests.html$', RedirectView.as_view(url='/meeting/requests', permanent=True)), (r'^requests$', views.meeting_requests), (r'^agenda(?P.txt)$', views.agenda), (r'^agenda/agenda.ics$', views.ical_agenda), @@ -19,13 +19,13 @@ urlpatterns = patterns('', (r'^agenda(?P.csv)$', views.agenda), (r'^agenda/week-view.html$', views.week_view), (r'^week-view.html$', views.week_view), - (r'^(?P\d+)/schedule/edit$', views.edit_agenda), + (r'^(?P\d+)/schedule/edit$', views.edit_agenda), (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/edit$', views.edit_agenda), (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties), (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)(?P.html)?/?$', views.agenda), (r'^(?P\d+)/agenda(?P.html)?/?$', views.agenda), (r'^(?P\d+)/(?Pagenda-utc)(?P.html)?/?$', views.agenda), - (r'^(?P\d+)/requests.html$', redirect_to, {"url": '/meeting/%(num)s/requests', "permanent": True}), + (r'^(?P\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)), (r'^(?P\d+)/requests$', views.meeting_requests), (r'^(?P\d+)/agenda(?P.txt)$', views.agenda), (r'^(?P\d+)/agenda.ics$', views.ical_agenda), diff --git a/ietf/nomcom/redirect_ann_urls.py b/ietf/nomcom/redirect_ann_urls.py index 993680f78..7688896b5 100644 --- a/ietf/nomcom/redirect_ann_urls.py +++ b/ietf/nomcom/redirect_ann_urls.py @@ -1,7 +1,7 @@ -from django.conf.urls.defaults import patterns -from django.views.generic.simple import redirect_to +from django.conf.urls import patterns +from django.views.generic import RedirectView urlpatterns = patterns('', - (r'^nomcom/$', 'django.views.generic.simple.redirect_to', { 'url': "/nomcom/ann/", 'permanent': True }), - (r'^nomcom/(?P\d+)/$', 'django.views.generic.simple.redirect_to', { 'url': "/nomcom/ann/%(message_id)s/", 'permanent': True }), + (r'^nomcom/$', RedirectView.as_view(url="/nomcom/ann/", permanent=True)), + (r'^nomcom/(?P\d+)/$', RedirectView.as_view(url="/nomcom/ann/%(message_id)s/", permanent=True)), ) diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py index 595cdcbc3..e297b31c1 100644 --- a/ietf/nomcom/urls.py +++ b/ietf/nomcom/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import patterns, url -from django.views.generic.simple import direct_to_template, redirect_to -from ietf.utils.lazy import reverse_lazy +from django.conf.urls import patterns, url +from django.core.urlresolvers import reverse_lazy +from django.views.generic import RedirectView, TemplateView + from ietf.nomcom.forms import EditChairForm, EditChairFormPreview, \ EditMembersForm, EditMembersFormPreview @@ -19,13 +20,13 @@ urlpatterns = patterns('ietf.nomcom.views', url(r'^(?P\d{4})/private/view-feedback/nominee/(?P\d+)$', 'view_feedback_nominee', name='nomcom_view_feedback_nominee'), url(r'^(?P\d{4})/private/edit/nominee/(?P\d+)$', 'edit_nominee', name='nomcom_edit_nominee'), url(r'^(?P\d{4})/private/merge/$', 'private_merge', name='nomcom_private_merge'), -# url(r'^(?P\d{4})/private/send-reminder-mail/$', redirect_to, { 'url': reverse_lazy('nomcom_send_reminder_mail',kwargs={'year':year,'type':'accept'})}), +# url(r'^(?P\d{4})/private/send-reminder-mail/$', RedirectView.as_view(url=reverse_lazy('nomcom_send_reminder_mail',kwargs={'year':year,'type':'accept'}))), url(r'^(?P\d{4})/private/send-reminder-mail/(?P\w+)/$', 'send_reminder_mail', name='nomcom_send_reminder_mail'), url(r'^(?P\d{4})/private/edit-members/$', EditMembersFormPreview(EditMembersForm), name='nomcom_edit_members'), url(r'^(?P\d{4})/private/edit-chair/$', EditChairFormPreview(EditChairForm), name='nomcom_edit_chair'), url(r'^(?P\d{4})/private/edit-nomcom/$', 'edit_nomcom', name='nomcom_edit_nomcom'), url(r'^(?P\d{4})/private/delete-nomcom/$', 'delete_nomcom', name='nomcom_delete_nomcom'), - url(r'^deleted/$', direct_to_template, {'template': 'nomcom/deleted.html'}, name='nomcom_deleted'), + url(r'^deleted/$', TemplateView.as_view(template='nomcom/deleted.html'), name='nomcom_deleted'), url(r'^(?P\d{4})/private/chair/templates/$', 'list_templates', name='nomcom_list_templates'), url(r'^(?P\d{4})/private/chair/templates/(?P\d+)/$', 'edit_template', name='nomcom_edit_template'), url(r'^(?P\d{4})/private/chair/position/$', 'list_positions', name='nomcom_list_positions'), @@ -44,6 +45,7 @@ urlpatterns = patterns('ietf.nomcom.views', ) +# use the generic view from message urlpatterns += patterns('', url(r'^ann/(?P\d+)/$', 'ietf.message.views.message', {'group_type': "nomcom" }, "nomcom_announcement"), ) diff --git a/ietf/person/urls.py b/ietf/person/urls.py index 4e39eb6f1..1fd067af3 100644 --- a/ietf/person/urls.py +++ b/ietf/person/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from ietf.person import ajax urlpatterns = patterns('', diff --git a/ietf/redirects/urls.py b/ietf/redirects/urls.py index 02a1cec54..db7095300 100644 --- a/ietf/redirects/urls.py +++ b/ietf/redirects/urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('', (r'^(?P