Skip to content

Commit c2541ec

Browse files
levkowetzlevkowetz
committed
Django 1.9: Removed deprecated use of django.conf.urls.patterns() from all urls*.py files.
 - Legacy-Id: 12618
1 parent bfc44de commit c2541ec

40 files changed

Lines changed: 521 additions & 533 deletions

File tree

‎ietf/community/urls.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22

33

4-
urlpatterns = patterns('',
4+
urlpatterns = [
55
url(r'^personal/(?P<username>[^/]+)/$', 'ietf.community.views.view_list'),
66
url(r'^personal/(?P<username>[^/]+)/manage/$', 'ietf.community.views.manage_list'),
77
url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.track_document'),
88
url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.untrack_document'),
99
url(r'^personal/(?P<username>[^/]+)/csv/$', 'ietf.community.views.export_to_csv'),
1010
url(r'^personal/(?P<username>[^/]+)/feed/$', 'ietf.community.views.feed'),
1111
url(r'^personal/(?P<username>[^/]+)/subscription/$', 'ietf.community.views.subscription'),
12-
13-
)
12+
]

‎ietf/cookies/urls.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Copyright The IETF Trust 2010, All Rights Reserved
22

3-
from django.conf.urls import patterns
3+
from django.conf.urls import url
44
from ietf.cookies import views
55

6-
urlpatterns = patterns('',
7-
(r'^$', views.preferences),
8-
(r'^new_enough/(?P<days>.+)$', views.new_enough),
9-
(r'^new_enough/', views.new_enough),
10-
(r'^expires_soon/(?P<days>.+)$', views.expires_soon),
11-
(r'^expires_soon/', views.expires_soon),
12-
(r'^full_draft/(?P<enabled>.+)$', views.full_draft),
13-
(r'^full_draft/', views.full_draft),
14-
(r'^left_menu/(?P<enabled>.+)$', views.left_menu),
15-
(r'^left_menu/', views.left_menu),
16-
)
6+
urlpatterns = [
7+
url(r'^$', views.preferences),
8+
url(r'^new_enough/(?P<days>.+)$', views.new_enough),
9+
url(r'^new_enough/', views.new_enough),
10+
url(r'^expires_soon/(?P<days>.+)$', views.expires_soon),
11+
url(r'^expires_soon/', views.expires_soon),
12+
url(r'^full_draft/(?P<enabled>.+)$', views.full_draft),
13+
url(r'^full_draft/', views.full_draft),
14+
url(r'^left_menu/(?P<enabled>.+)$', views.left_menu),
15+
url(r'^left_menu/', views.left_menu),
16+
]

‎ietf/dbtemplate/urls.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22

33

4-
urlpatterns = patterns('ietf.dbtemplate.views',
5-
url(r'^(?P<acronym>[-a-z0-9]+)/$', 'template_list', name='template_list'),
6-
url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', 'template_edit', name='template_edit'),
7-
)
4+
urlpatterns = [
5+
url(r'^(?P<acronym>[-a-z0-9]+)/$', 'ietf.dbtemplate.views.template_list', name='template_list'),
6+
url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', 'ietf.dbtemplate.views.template_edit', name='template_edit'),
7+
]

‎ietf/doc/urls.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3131
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232

33-
from django.conf.urls import patterns, url, include
33+
from django.conf.urls import url, include
3434
from django.views.generic import RedirectView
3535
from django.conf import settings
3636

@@ -42,13 +42,13 @@
4242
url(r'^(?P<session_id>\d+)/remove$', views_doc.remove_sessionpresentation),
4343
]
4444

45-
urlpatterns = patterns('',
46-
(r'^/?$', views_search.search),
45+
urlpatterns = [
46+
url(r'^/?$', views_search.search),
4747
url(r'^(?P<name>[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name, name="doc_search_for_name"),
4848
url(r'^search/$', views_search.search, name="doc_search"),
4949
url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"),
5050
url(r'^ad/(?P<name>[\w.-]+)/$(?u)', views_search.docs_for_ad, name="docs_for_ad"),
51-
(r'^ad2/(?P<name>[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
51+
url(r'^ad2/(?P<name>[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
5252
url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'),
5353
url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change, name='start_rfc_status_change'),
5454
url(r'^iesg/(?P<last_call_only>[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"),
@@ -75,8 +75,8 @@
7575
url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot, name="doc_ballot"),
7676
url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/position/$' % settings.URL_REGEXPS, views_ballot.edit_position),
7777
url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
78-
(r'^%(name)s/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
79-
(r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
78+
url(r'^%(name)s/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
79+
url(r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
8080
url(r'^(?P<name>[A-Za-z0-9._+-]+)/reviewrequest/', include("ietf.doc.urls_review")),
8181

8282
url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='doc_email', permanent=False),name='doc_specific_email_aliases'),
@@ -120,12 +120,12 @@
120120
url(r'^help/relationships/$', 'ietf.doc.views_help.relationship_help', name="relationship_help"),
121121
url(r'^help/relationships/(?P<subset>\w+)/$', 'ietf.doc.views_help.relationship_help', name="relationship_subset_help"),
122122

123-
(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations),
123+
url(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations),
124124

125-
(r'^%(charter)s/' % settings.URL_REGEXPS, include('ietf.doc.urls_charter')),
126-
(r'^%(name)s/conflict-review/' % settings.URL_REGEXPS, include('ietf.doc.urls_conflict_review')),
127-
(r'^%(name)s/status-change/' % settings.URL_REGEXPS, include('ietf.doc.urls_status_change')),
128-
(r'^%(name)s/material/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
129-
(r'^%(name)s/session/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
130-
(r'^(?P<name>[A-Za-z0-9._+-]+)/session/', include(session_patterns)),
131-
)
125+
url(r'^%(charter)s/' % settings.URL_REGEXPS, include('ietf.doc.urls_charter')),
126+
url(r'^%(name)s/conflict-review/' % settings.URL_REGEXPS, include('ietf.doc.urls_conflict_review')),
127+
url(r'^%(name)s/status-change/' % settings.URL_REGEXPS, include('ietf.doc.urls_status_change')),
128+
url(r'^%(name)s/material/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
129+
url(r'^%(name)s/session/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
130+
url(r'^(?P<name>[A-Za-z0-9._+-]+)/session/', include(session_patterns)),
131+
]

‎ietf/doc/urls_charter.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright The IETF Trust 2011, All Rights Reserved
22

3-
from django.conf.urls import patterns, url
3+
from django.conf.urls import url
44
from django.conf import settings
55

6-
urlpatterns = patterns('',
6+
urlpatterns = [
77
url(r'^state/$', "ietf.doc.views_charter.change_state", name='charter_change_state'),
88
url(r'^title/$', "ietf.doc.views_charter.change_title", name='charter_change_title'),
99
url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.doc.views_charter.change_state", name='charter_startstop_process'),
@@ -16,4 +16,4 @@
1616
url(r'^approve/$', "ietf.doc.views_charter.approve", name='charter_approve'),
1717
url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', "ietf.doc.views_charter.submit", name='charter_submit'),
1818
url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
19-
)
19+
]

‎ietf/doc/urls_conflict_review.py‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
from django.conf.urls import patterns, url
2-
3-
urlpatterns = patterns('ietf.doc.views_conflict_review',
4-
url(r'^state/$', "change_state", name='conflict_review_change_state'),
5-
url(r'^submit/$', "submit", name='conflict_review_submit'),
6-
url(r'^ad/$', "edit_ad", name='conflict_review_ad'),
7-
url(r'^approve/$', "approve", name='conflict_review_approve'),
8-
url(r'^start_conflict_review/$', "start_review", name='conflict_review_start'),
9-
)
10-
11-
urlpatterns += patterns('ietf.doc.views_doc',
12-
url(r'^telechat/$', "telechat_date", name='conflict_review_telechat_date'),
13-
url(r'^notices/$', "edit_notify", name='conflict_review_notices'),
14-
)
1+
from django.conf.urls import url
2+
3+
urlpatterns = [
4+
url(r'^state/$', "ietf.doc.views_conflict_review.change_state", name='conflict_review_change_state'),
5+
url(r'^submit/$', "ietf.doc.views_conflict_review.submit", name='conflict_review_submit'),
6+
url(r'^ad/$', "ietf.doc.views_conflict_review.edit_ad", name='conflict_review_ad'),
7+
url(r'^approve/$', "ietf.doc.views_conflict_review.approve", name='conflict_review_approve'),
8+
url(r'^start_conflict_review/$', "ietf.doc.views_conflict_review.start_review", name='conflict_review_start'),
9+
url(r'^telechat/$', "ietf.doc.views_doc.telechat_date", name='conflict_review_telechat_date'),
10+
url(r'^notices/$', "ietf.doc.views_doc.edit_notify", name='conflict_review_notices'),
11+
]
1512

1613

‎ietf/doc/urls_material.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22

3-
urlpatterns = patterns('ietf.doc.views_material',
4-
url(r'^(?P<action>state|title|abstract|revise)/$', "edit_material", name="material_edit"),
5-
)
3+
urlpatterns = [
4+
url(r'^(?P<action>state|title|abstract|revise)/$', "ietf.doc.views_material.edit_material", name="material_edit"),
5+
]
66

‎ietf/doc/urls_review.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22
from ietf.doc import views_review
33

4-
urlpatterns = patterns('',
4+
urlpatterns = [
55
url(r'^$', views_review.request_review),
66
url(r'^(?P<request_id>[0-9]+)/$', views_review.review_request),
77
url(r'^(?P<request_id>[0-9]+)/close/$', views_review.close_request),
@@ -10,5 +10,4 @@
1010
url(r'^(?P<request_id>[0-9]+)/complete/$', views_review.complete_review),
1111
url(r'^(?P<request_id>[0-9]+)/searchmailarchive/$', views_review.search_mail_archive),
1212
url(r'^(?P<request_id>[0-9]+)/editcomment/$', views_review.edit_comment),
13-
)
14-
13+
]

‎ietf/doc/urls_status_change.py‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
from django.conf.urls import patterns, url
2-
3-
urlpatterns = patterns('ietf.doc.views_status_change',
4-
url(r'^state/$', "change_state", name='status_change_change_state'),
5-
url(r'^submit/$', "submit", name='status_change_submit'),
6-
url(r'^ad/$', "edit_ad", name='status_change_ad'),
7-
url(r'^title/$', "edit_title", name='status_change_title'),
8-
url(r'^approve/$', "approve", name='status_change_approve'),
9-
url(r'^relations/$', "edit_relations", name='status_change_relations'),
10-
url(r'^last-call/$', "last_call", name='status_change_last_call'),
11-
)
12-
13-
urlpatterns += patterns('ietf.doc.views_doc',
14-
url(r'^telechat/$', "telechat_date", name='status_change_telechat_date'),
15-
url(r'^notices/$', "edit_notify", name='status_change_notices'),
16-
)
1+
from django.conf.urls import url
2+
3+
urlpatterns = [
4+
url(r'^state/$', "ietf.doc.views_status_change.change_state", name='status_change_change_state'),
5+
url(r'^submit/$', "ietf.doc.views_status_change.submit", name='status_change_submit'),
6+
url(r'^ad/$', "ietf.doc.views_status_change.edit_ad", name='status_change_ad'),
7+
url(r'^title/$', "ietf.doc.views_status_change.edit_title", name='status_change_title'),
8+
url(r'^approve/$', "ietf.doc.views_status_change.approve", name='status_change_approve'),
9+
url(r'^relations/$', "ietf.doc.views_status_change.edit_relations", name='status_change_relations'),
10+
url(r'^last-call/$', "ietf.doc.views_status_change.last_call", name='status_change_last_call'),
11+
url(r'^telechat/$', "ietf.doc.views_doc.telechat_date", name='status_change_telechat_date'),
12+
url(r'^notices/$', "ietf.doc.views_doc.edit_notify", name='status_change_notices'),
13+
]
1714

1815

‎ietf/group/urls.py‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Copyright The IETF Trust 2007, All Rights Reserved
22

3-
from django.conf.urls import patterns, include
3+
from django.conf.urls import url, include
44
from django.conf import settings
55

6-
urlpatterns = patterns('',
7-
(r'^$', 'ietf.group.views.active_groups'),
8-
(r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
9-
(r'^%(acronym)s.json$' % settings.URL_REGEXPS, 'ietf.group.views_ajax.group_json'),
10-
(r'^chartering/$', 'ietf.group.views.chartering_groups'),
11-
(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
12-
(r'^concluded/$', 'ietf.group.views.concluded_groups'),
13-
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
14-
(r'^all-status/$', 'ietf.group.views.all_status'),
15-
16-
(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.group.views.group_home', None, "group_home"),
17-
(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
18-
)
6+
urlpatterns = [
7+
url(r'^$', 'ietf.group.views.active_groups'),
8+
url(r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
9+
url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, 'ietf.group.views_ajax.group_json'),
10+
url(r'^chartering/$', 'ietf.group.views.chartering_groups'),
11+
url(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
12+
url(r'^concluded/$', 'ietf.group.views.concluded_groups'),
13+
url(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
14+
url(r'^all-status/$', 'ietf.group.views.all_status'),
1915

16+
url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.group.views.group_home', None, "group_home"),
17+
url(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
18+
]

0 commit comments

Comments
 (0)