altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Port to new class-based generic redirect and simple template views, remove utils.lazy.reverse_lazy, it's now included in Django

Browse source 
- Legacy-Id: 6878
This commit is contained in:
Ole Laursen 2013-12-11 16:36:09 +00:00
parent 7a86afe1ab
commit cfa0d47ca0
42 changed files with 145 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/community/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
urlpatterns = patterns('ietf.community.views',

2
ietf/cookies/urls.py
View file

@ -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('',

2
ietf/dbtemplate/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
urlpatterns = patterns('ietf.dbtemplate.views',

24
ietf/doc/redirect_drafts_urls.py
View file

@ -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<object_id>\d+)/(related/)?$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/' }),
(r'^(?P<name>[^/]+)/(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<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/')),
(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/')),
(r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
(r'^wg/(?P<acronym>[^/]+)/$', '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<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')),
(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='http://www.ietf.org/id/all_id.txt')),
)

20
ietf/doc/redirect_idtracker_urls.py
View file

@ -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<rfc_number>\d+)/$', redirect_to, {'url':'/doc/rfc%(rfc_number)s/' }),
(r'^(?P<name>[^/]+)/$', redirect_to, {'url':'/doc/%(name)s/' }),
(r'^(?P<name>[^/]+)/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<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/')),
(r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/')),
(r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/')),
(r'^$', RedirectView.as_view(url='/doc/')),
)

15
ietf/doc/urls.py
View file

@ -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<name>[A-Za-z0-9.-]+)/$', views_search.docs_for_ad, name="docs_for_ad"),
)
urlpatterns += patterns('django.views.generic.simple',
(r'^ad2/(?P<name>[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<name>[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<name>[A-Za-z0-9._+-]*)$', views_status_change.start_rfc_status_change, name='start_rfc_status_change'),
url(r'^iesg/(?P<last_call_only>[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"),

2
ietf/doc/urls_conflict_review.py
View file

@ -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'),

2
ietf/doc/urls_status_change.py
View file

@ -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'),

2
ietf/group/admin.py
View file

@ -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):

2
ietf/group/stream_urls.py
View file

@ -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

6
ietf/group/urls.py
View file

@ -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<groupname>[a-z0-9]+).json$', ajax.group_json),
(r'^(?P<groupname>[a-z0-9]+).json$', 'ietf.group.ajax.group_json'),
)

2
ietf/help/urls.py
View file

@ -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<doc>[-\w]+)/(?P<type>[-\w]+)/?$', 'ietf.help.views.state'),

34
ietf/iesg/urls.py
View file

@ -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<year>[0-9]{4})/)?$', views.review_decisions),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?$', views.agenda),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda.txt$', views.agenda_txt),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda.json$', views.agenda_json),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?scribe_template.html$', views.agenda_scribe_template),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?moderator_package.html$', views.agenda_moderator_package),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda_package.txt$', views.agenda_package),
(r'^decisions/(?:(?P<year>[0-9]{4})/)?$', "ietf.iesg.views.review_decisions"),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?$', "ietf.iesg.views.agenda"),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda.txt$', "ietf.iesg.views.agenda_txt"),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda.json$', "ietf.iesg.views.agenda_json"),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?scribe_template.html$', "ietf.iesg.views.agenda_scribe_template"),
(r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?moderator_package.html$', "ietf.iesg.views.agenda_moderator_package"),
(r'^agenda/(?:(?P<date>\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<date>\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<date>\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"),
)

7
ietf/iesg/views.py
View file

@ -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):

2
ietf/ietfauth/urls.py
View file

@ -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'),

8
ietf/ipr/urls.py
View file

@ -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<ipr_id>\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<ipr_id>\d+)/$', new.update),
(r'^new-(?P<type>specific)/$', new.new),
(r'^new-(?P<type>generic)/$', new.new),

18
ietf/liaisons/urls.py
View file

@ -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<object_id>\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'),
)

9
ietf/mailinglists/urls.py
View file

@ -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')),
)

12
ietf/meeting/urls.py
View file

@ -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<meeting_num>\d+)/materials.html$', views.materials),
(r'^agenda/$', views.agenda),
(r'^agenda/$', views.agenda),
(r'^(?P<base>agenda-utc)(?P<ext>.html)?$', views.agenda),
(r'^agenda(?P<ext>.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<ext>.txt)$', views.agenda),
(r'^agenda/agenda.ics$', views.ical_agenda),
@ -19,13 +19,13 @@ urlpatterns = patterns('',
(r'^agenda(?P<ext>.csv)$', views.agenda),
(r'^agenda/week-view.html$', views.week_view),
(r'^week-view.html$', views.week_view),
(r'^(?P<num>\d+)/schedule/edit$', views.edit_agenda),
(r'^(?P<num>\d+)/schedule/edit$', views.edit_agenda),
(r'^(?P<num>\d+)/schedule/(?P<schedule_name>[A-Za-z0-9-:_]+)/edit$', views.edit_agenda),
(r'^(?P<num>\d+)/schedule/(?P<schedule_name>[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties),
(r'^(?P<num>\d+)/schedule/(?P<name>[A-Za-z0-9-:_]+)(?P<ext>.html)?/?$', views.agenda),
(r'^(?P<num>\d+)/agenda(?P<ext>.html)?/?$', views.agenda),
(r'^(?P<num>\d+)/(?P<base>agenda-utc)(?P<ext>.html)?/?$', views.agenda),
(r'^(?P<num>\d+)/requests.html$', redirect_to, {"url": '/meeting/%(num)s/requests', "permanent": True}),
(r'^(?P<num>\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)),
(r'^(?P<num>\d+)/requests$', views.meeting_requests),
(r'^(?P<num>\d+)/agenda(?P<ext>.txt)$', views.agenda),
(r'^(?P<num>\d+)/agenda.ics$', views.ical_agenda),

8
ietf/nomcom/redirect_ann_urls.py
View file

@ -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<message_id>\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<message_id>\d+)/$', RedirectView.as_view(url="/nomcom/ann/%(message_id)s/", permanent=True)),
)

12
ietf/nomcom/urls.py
View file

@ -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<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', 'view_feedback_nominee', name='nomcom_view_feedback_nominee'),
url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', 'edit_nominee', name='nomcom_edit_nominee'),
url(r'^(?P<year>\d{4})/private/merge/$', 'private_merge', name='nomcom_private_merge'),
# url(r'^(?P<year>\d{4})/private/send-reminder-mail/$', redirect_to, { 'url': reverse_lazy('nomcom_send_reminder_mail',kwargs={'year':year,'type':'accept'})}),
# url(r'^(?P<year>\d{4})/private/send-reminder-mail/$', RedirectView.as_view(url=reverse_lazy('nomcom_send_reminder_mail',kwargs={'year':year,'type':'accept'}))),
url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', 'send_reminder_mail', name='nomcom_send_reminder_mail'),
url(r'^(?P<year>\d{4})/private/edit-members/$', EditMembersFormPreview(EditMembersForm), name='nomcom_edit_members'),
url(r'^(?P<year>\d{4})/private/edit-chair/$', EditChairFormPreview(EditChairForm), name='nomcom_edit_chair'),
url(r'^(?P<year>\d{4})/private/edit-nomcom/$', 'edit_nomcom', name='nomcom_edit_nomcom'),
url(r'^(?P<year>\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<year>\d{4})/private/chair/templates/$', 'list_templates', name='nomcom_list_templates'),
url(r'^(?P<year>\d{4})/private/chair/templates/(?P<template_id>\d+)/$', 'edit_template', name='nomcom_edit_template'),
url(r'^(?P<year>\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<message_id>\d+)/$', 'ietf.message.views.message', {'group_type': "nomcom" }, "nomcom_announcement"),
)

2
ietf/person/urls.py
View file

@ -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('',

2
ietf/redirects/urls.py
View file

@ -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<script>.*?\.cgi)(/.*)?$', 'ietf.redirects.views.redirect'),

2
ietf/secr/announcement/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.announcement.views',
url(r'^$', 'main', name='announcement'),

2
ietf/secr/areas/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.areas.views',
url(r'^$', 'list_areas', name='areas'),

2
ietf/secr/console/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.console.views',
url(r'^$', 'main', name='console'),

2
ietf/secr/drafts/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.drafts.views',
url(r'^$', 'search', name='drafts'),

2
ietf/secr/groups/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.groups.views',
url(r'^$', 'search', name='groups'),

6
ietf/secr/ipradmin/urls.py
View file

@ -1,8 +1,8 @@
from django.conf.urls.defaults import *
from django.views.generic.simple import redirect_to
from django.conf.urls import patterns, url
from django.views.generic import RedirectView
urlpatterns = patterns('ietf.secr.ipradmin.views',
url(r'^$', redirect_to, {'url': 'admin/'}, name="ipradmin"),
url(r'^$', RedirectView(url='admin/'), name="ipradmin"),
url(r'^admin/?$', 'admin_list', name="ipradmin_admin_list"),
url(r'^admin/detail/(?P<ipr_id>\d+)/?$', 'admin_detail', name="ipradmin_admin_detail"),
url(r'^admin/create/?$', 'admin_create', name="ipradmin_admin_create"),

2
ietf/secr/meetings/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.meetings.views',
url(r'^$', 'main', name='meetings'),

2
ietf/secr/proceedings/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.proceedings.views',
url(r'^$', 'main', name='proceedings'),

2
ietf/secr/roles/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.roles.views',
url(r'^$', 'main', name='roles'),

2
ietf/secr/rolodex/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.rolodex.views',
url(r'^$', 'search', name='rolodex'),

2
ietf/secr/sreq/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.sreq.views',
url(r'^$', 'main', name='sessions'),

2
ietf/secr/telechat/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *
urlpatterns = patterns('ietf.secr.telechat.views',
url(r'^$', 'main', name='telechat'),

8
ietf/secr/urls.py
View file

@ -1,10 +1,8 @@
from django.conf import settings
from django.conf.urls.defaults import *
from django.contrib import admin
from django.views.generic.simple import direct_to_template
from django.conf.urls import patterns, url
from django.views.generic import TemplateView
urlpatterns = patterns('',
url(r'^$', direct_to_template, {'template': 'main.html'}, name="home"),
url(r'^$', TemplateView.as_view(template='main.html'), name="home"),
(r'^announcement/', include('ietf.secr.announcement.urls')),
(r'^areas/', include('ietf.secr.areas.urls')),
(r'^console/', include('ietf.secr.console.urls')),

2
ietf/submit/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
urlpatterns = patterns('ietf.submit.views',

2
ietf/sync/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
urlpatterns = patterns('',
url(r'^discrepancies/$', 'ietf.sync.views.discrepancies'),

8
ietf/urls.py
View file

@ -1,8 +1,8 @@
# Copyright The IETF Trust 2007, 2009, All Rights Reserved
import django
from django.conf.urls.defaults import patterns, include, handler404, handler500
from django.conf.urls import patterns, include, handler404, handler500
from django.contrib import admin
from django.views.generic import RedirectView, TemplateView
from ietf.iesg.feeds import IESGAgenda
from ietf.doc.feeds import DocumentChanges, InLastCall
@ -53,7 +53,7 @@ urlpatterns = patterns('',
(r'^cookies/', include('ietf.cookies.urls')),
(r'^doc/', include('ietf.doc.urls')),
(r'^drafts/', include('ietf.doc.redirect_drafts_urls')),
(r'^feed/comments/(?P<remainder>.*)/$', 'django.views.generic.simple.redirect_to', { 'url': '/feed/document-changes/%(remainder)s/'}),
(r'^feed/comments/(?P<remainder>.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/')),
(r'^feed/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', { 'feed_dict': feeds}),
(r'^help/', include('ietf.help.urls')),
(r'^idtracker/', include('ietf.doc.redirect_idtracker_urls')),
@ -80,7 +80,7 @@ urlpatterns = patterns('',
(r'^(?P<path>public)/', include('ietf.redirects.urls')),
# Google webmaster tools verification url
(r'^googlea30ad1dacffb5e5b.html', 'django.views.generic.simple.direct_to_template', { 'template': 'googlea30ad1dacffb5e5b.html' }),
(r'^googlea30ad1dacffb5e5b.html', TemplateView.as_view(template='googlea30ad1dacffb5e5b.html')),
(r'^%s/' % settings.DAJAXICE_MEDIA_PREFIX, include('dajaxice.urls')),
)

20
ietf/utils/lazy.py
View file

@ -1,20 +0,0 @@
from django.utils.functional import lazy
from django.core.urlresolvers import reverse
"""
A lazily evaluated version of `reverse()`_.
It is useful for when you need to use a URL reversal before Django's
URL names map is loaded. Some common cases where this method is necessary are:
* in your URL configuration (such as the ``url`` argument for the
``django.views.generic.simple.redirect_to`` generic view).
* providing a reversed URL to a decorator (such as the ``login_url`` argument
for the ``django.contrib.auth.decorators.permission_required`` decorator).
Usually unicode would be preference but str is the right type instead of unicode.
This is because reverse passes through iri_to_uri which converts it to a string
"""
reverse_lazy = lazy(reverse, str)

2
ietf/wgcharter/urls.py
View file

@ -1,6 +1,6 @@
# Copyright The IETF Trust 2011, All Rights Reserved
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
urlpatterns = patterns('',
url(r'^state/$', "ietf.wgcharter.views.change_state", name='charter_change_state'),

54
ietf/wginfo/urls.py
View file

@ -1,33 +1,33 @@
# Copyright The IETF Trust 2008, All Rights Reserved
from django.conf.urls.defaults import patterns, include
from ietf.wginfo import views, edit, milestones
from django.views.generic.simple import redirect_to
from django.conf.urls import patterns, include
from django.views.generic import RedirectView
from ietf.wginfo import views, edit, milestones
urlpatterns = patterns('',
(r'^$', views.active_wgs),
(r'^summary.txt', redirect_to, { 'url':'/wg/1wg-summary.txt' }),
(r'^summary-by-area.txt', redirect_to, { 'url':'/wg/1wg-summary.txt' }),
(r'^summary-by-acronym.txt', redirect_to, { 'url':'/wg/1wg-summary-by-acronym.txt' }),
(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/$', views.chartering_wgs),
(r'^bofs/$', views.bofs),
(r'^chartering/create/$', edit.edit, {'action': "charter"}, "wg_create"),
(r'^bofs/create/$', edit.edit, {'action': "create"}, "bof_create"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/documents/txt/$', views.group_documents_txt),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/$', views.group_documents, None, "wg_docs"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/charter/$', views.group_charter, None, 'group_charter'),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/init-charter/', edit.submit_initial_charter, None, "wg_init_charter"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/history/$', views.history),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', edit.edit, {'action': "edit"}, "group_edit"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/conclude/$', edit.conclude, None, "wg_conclude"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/$', milestones.edit_milestones, {'milestone_set': "current"}, "wg_edit_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/charter/$', milestones.edit_milestones, {'milestone_set': "charter"}, "wg_edit_charter_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/charter/reset/$', milestones.reset_charter_milestones, None, "wg_reset_charter_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/ajax/searchdocs/$', milestones.ajax_search_docs, None, "wg_ajax_search_docs"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/workflow/$', edit.customize_workflow),
(r'^$', views.active_wgs),
(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'^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/$', views.chartering_wgs),
(r'^bofs/$', views.bofs),
(r'^chartering/create/$', edit.edit, {'action': "charter"}, "wg_create"),
(r'^bofs/create/$', edit.edit, {'action': "create"}, "bof_create"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/documents/txt/$', views.group_documents_txt),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/$', views.group_documents, None, "wg_docs"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/charter/$', views.group_charter, None, 'group_charter'),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/init-charter/', edit.submit_initial_charter, None, "wg_init_charter"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/history/$', views.history),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', edit.edit, {'action': "edit"}, "group_edit"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/conclude/$', edit.conclude, None, "wg_conclude"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/$', milestones.edit_milestones, {'milestone_set': "current"}, "wg_edit_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/charter/$', milestones.edit_milestones, {'milestone_set': "charter"}, "wg_edit_charter_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/milestones/charter/reset/$', milestones.reset_charter_milestones, None, "wg_reset_charter_milestones"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/ajax/searchdocs/$', milestones.ajax_search_docs, None, "wg_ajax_search_docs"),
(r'^(?P<acronym>[a-zA-Z0-9-]+)/workflow/$', edit.customize_workflow),
)