Django 1.10 does not permit the view argument to url() to be a string any more. Changed all cases view arguments to url() which were strings to instead reference the actual imported function.

 - Legacy-Id: 12815

Author: levkowetz

ietf/community/urls.py

@@ -1,12 +1,14 @@
 from django.conf.urls import url
 
 
+from ietf.community import views
+
 urlpatterns = [
-    url(r'^personal/(?P<username>[^/]+)/$', 'ietf.community.views.view_list'),
-    url(r'^personal/(?P<username>[^/]+)/manage/$', 'ietf.community.views.manage_list'),
-    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.track_document'),
-    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.untrack_document'),
-    url(r'^personal/(?P<username>[^/]+)/csv/$', 'ietf.community.views.export_to_csv'),
-    url(r'^personal/(?P<username>[^/]+)/feed/$', 'ietf.community.views.feed'),
-    url(r'^personal/(?P<username>[^/]+)/subscription/$', 'ietf.community.views.subscription'),
+    url(r'^personal/(?P<username>[^/]+)/$', views.view_list),
+    url(r'^personal/(?P<username>[^/]+)/manage/$', views.manage_list),
+    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', views.track_document),
+    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', views.untrack_document),
+    url(r'^personal/(?P<username>[^/]+)/csv/$', views.export_to_csv),
+    url(r'^personal/(?P<username>[^/]+)/feed/$', views.feed),
+    url(r'^personal/(?P<username>[^/]+)/subscription/$', views.subscription),
 ]

ietf/dbtemplate/urls.py

@@ -1,7 +1,9 @@
 from django.conf.urls import url
 
 
+from ietf.dbtemplate import views
+
 urlpatterns = [
-    url(r'^(?P<acronym>[-a-z0-9]+)/$', 'ietf.dbtemplate.views.template_list', name='template_list'),
-    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', 'ietf.dbtemplate.views.template_edit', name='template_edit'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.template_list, name='template_list'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.template_edit, name='template_edit'),
 ]

ietf/doc/urls.py

@@ -34,7 +34,7 @@
 from django.views.generic import RedirectView
 from django.conf import settings
 
-from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats
+from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats, views_help
 
 session_patterns = [
     url(r'^add$', views_doc.add_sessionpresentation),
@@ -116,9 +116,9 @@
     url(r'^%(name)s/edit/approveballot/$' % settings.URL_REGEXPS, views_ballot.approve_ballot, name='doc_approve_ballot'),
     url(r'^%(name)s/edit/makelastcall/$' % settings.URL_REGEXPS, views_ballot.make_last_call, name='doc_make_last_call'),
 
-    url(r'^help/state/(?P<type>[\w-]+)/$', 'ietf.doc.views_help.state_help', name="state_help"),
-    url(r'^help/relationships/$', 'ietf.doc.views_help.relationship_help', name="relationship_help"),
-    url(r'^help/relationships/(?P<subset>\w+)/$', 'ietf.doc.views_help.relationship_help', name="relationship_subset_help"),
+    url(r'^help/state/(?P<type>[\w-]+)/$', views_help.state_help, name="state_help"),
+    url(r'^help/relationships/$', views_help.relationship_help, name="relationship_help"),
+    url(r'^help/relationships/(?P<subset>\w+)/$', views_help.relationship_help, name="relationship_subset_help"),
 
     url(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations),
 

ietf/doc/urls_charter.py

@@ -3,17 +3,19 @@
 from django.conf.urls import url
 from django.conf import settings
 
+from ietf.doc import views_charter, views_doc
+
 urlpatterns = [
-    url(r'^state/$', "ietf.doc.views_charter.change_state", name='charter_change_state'),
-    url(r'^title/$', "ietf.doc.views_charter.change_title", name='charter_change_title'),
-    url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.doc.views_charter.change_state", name='charter_startstop_process'),
-    url(r'^telechat/$', "ietf.doc.views_doc.telechat_date", name='charter_telechat_date'),
-    url(r'^notify/$', "ietf.doc.views_doc.edit_notify", name='charter_edit_notify'),
-    url(r'^ad/$', "ietf.doc.views_charter.edit_ad", name='charter_edit_ad'),
-    url(r'^action/$', "ietf.doc.views_charter.action_announcement_text"),
-    url(r'^review/$', "ietf.doc.views_charter.review_announcement_text"),
-    url(r'^ballotwriteupnotes/$', "ietf.doc.views_charter.ballot_writeupnotes"),
-    url(r'^approve/$', "ietf.doc.views_charter.approve", name='charter_approve'),
-    url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', "ietf.doc.views_charter.submit", name='charter_submit'),
-    url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
+    url(r'^state/$', views_charter.change_state, name='charter_change_state'),
+    url(r'^title/$', views_charter.change_title, name='charter_change_title'),
+    url(r'^(?P<option>initcharter|recharter|abandon)/$', views_charter.change_state, name='charter_startstop_process'),
+    url(r'^telechat/$', views_doc.telechat_date, name='charter_telechat_date'),
+    url(r'^notify/$', views_doc.edit_notify, name='charter_edit_notify'),
+    url(r'^ad/$', views_charter.edit_ad, name='charter_edit_ad'),
+    url(r'^action/$', views_charter.action_announcement_text),
+    url(r'^review/$', views_charter.review_announcement_text),
+    url(r'^ballotwriteupnotes/$', views_charter.ballot_writeupnotes),
+    url(r'^approve/$', views_charter.approve, name='charter_approve'),
+    url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', views_charter.submit, name='charter_submit'),
+    url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, views_charter.charter_with_milestones_txt, name='charter_with_milestones_txt'),
 ]

ietf/doc/urls_conflict_review.py

@@ -1,13 +1,15 @@
 from django.conf.urls import url
 
+from ietf.doc import views_conflict_review, views_doc
+
 urlpatterns = [
-    url(r'^state/$',                 "ietf.doc.views_conflict_review.change_state",  name='conflict_review_change_state'),
-    url(r'^submit/$',                "ietf.doc.views_conflict_review.submit",        name='conflict_review_submit'),
-    url(r'^ad/$',                    "ietf.doc.views_conflict_review.edit_ad",       name='conflict_review_ad'),
-    url(r'^approve/$',               "ietf.doc.views_conflict_review.approve",       name='conflict_review_approve'),
-    url(r'^start_conflict_review/$', "ietf.doc.views_conflict_review.start_review",  name='conflict_review_start'),
-    url(r'^telechat/$',              "ietf.doc.views_doc.telechat_date", name='conflict_review_telechat_date'),
-    url(r'^notices/$',               "ietf.doc.views_doc.edit_notify",  name='conflict_review_notices'),
+    url(r'^state/$',                 views_conflict_review.change_state,  name='conflict_review_change_state'),
+    url(r'^submit/$',                views_conflict_review.submit,        name='conflict_review_submit'),
+    url(r'^ad/$',                    views_conflict_review.edit_ad,       name='conflict_review_ad'),
+    url(r'^approve/$',               views_conflict_review.approve,       name='conflict_review_approve'),
+    url(r'^start_conflict_review/$', views_conflict_review.start_review,  name='conflict_review_start'),
+    url(r'^telechat/$',              views_doc.telechat_date, name='conflict_review_telechat_date'),
+    url(r'^notices/$',               views_doc.edit_notify,  name='conflict_review_notices'),
 ]
 
 

ietf/doc/urls_material.py

@@ -1,6 +1,8 @@
 from django.conf.urls import url
 
+from ietf.doc import views_material
+
 urlpatterns = [
-    url(r'^(?P<action>state|title|abstract|revise)/$', "ietf.doc.views_material.edit_material", name="material_edit"),
+    url(r'^(?P<action>state|title|abstract|revise)/$', views_material.edit_material, name="material_edit"),
 ]
 

ietf/doc/urls_status_change.py

@@ -1,15 +1,17 @@
 from django.conf.urls import url
 
+from ietf.doc import views_status_change, views_doc
+
 urlpatterns = [
-    url(r'^state/$',                 "ietf.doc.views_status_change.change_state",   name='status_change_change_state'),
-    url(r'^submit/$',                "ietf.doc.views_status_change.submit",         name='status_change_submit'),
-    url(r'^ad/$',                    "ietf.doc.views_status_change.edit_ad",        name='status_change_ad'),
-    url(r'^title/$',                 "ietf.doc.views_status_change.edit_title",     name='status_change_title'),
-    url(r'^approve/$',               "ietf.doc.views_status_change.approve",        name='status_change_approve'),
-    url(r'^relations/$',             "ietf.doc.views_status_change.edit_relations", name='status_change_relations'),
-    url(r'^last-call/$',             "ietf.doc.views_status_change.last_call",      name='status_change_last_call'),
-    url(r'^telechat/$',              "ietf.doc.views_doc.telechat_date",  name='status_change_telechat_date'),
-    url(r'^notices/$',               "ietf.doc.views_doc.edit_notify",   name='status_change_notices'),
+    url(r'^state/$',                 views_status_change.change_state,   name='status_change_change_state'),
+    url(r'^submit/$',                views_status_change.submit,         name='status_change_submit'),
+    url(r'^ad/$',                    views_status_change.edit_ad,        name='status_change_ad'),
+    url(r'^title/$',                 views_status_change.edit_title,     name='status_change_title'),
+    url(r'^approve/$',               views_status_change.approve,        name='status_change_approve'),
+    url(r'^relations/$',             views_status_change.edit_relations, name='status_change_relations'),
+    url(r'^last-call/$',             views_status_change.last_call,      name='status_change_last_call'),
+    url(r'^telechat/$',              views_doc.telechat_date,  name='status_change_telechat_date'),
+    url(r'^notices/$',               views_doc.edit_notify,   name='status_change_notices'),
 ]
 
 

ietf/group/urls.py

@@ -3,16 +3,18 @@
 from django.conf.urls import url, include
 from django.conf import settings
 
+from ietf.group import views, views_ajax, views_edit
+
 urlpatterns = [
-    url(r'^$', 'ietf.group.views.active_groups'), 
-    url(r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
-    url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, 'ietf.group.views_ajax.group_json'),
-    url(r'^chartering/$', 'ietf.group.views.chartering_groups'),
-    url(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
-    url(r'^concluded/$', 'ietf.group.views.concluded_groups'),
-    url(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
-    url(r'^all-status/$', 'ietf.group.views.all_status'),
+    url(r'^$', views.active_groups), 
+    url(r'^groupmenu.json', views_ajax.group_menu_data, None, "group_menu_data"),
+    url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, views_ajax.group_json),
+    url(r'^chartering/$', views.chartering_groups),
+    url(r'^chartering/create/(?P<group_type>(wg|rg))/$', views_edit.edit, {'action': "charter"}, "group_create"),
+    url(r'^concluded/$', views.concluded_groups),
+    url(r'^email-aliases/$', views.email_aliases),
+    url(r'^all-status/$', views.all_status),
 
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.group.views.group_home', None, "group_home"),
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.group_home, None, "group_home"),
     url(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
 ]

ietf/group/urls_info.py

@@ -18,7 +18,7 @@
     url(r'^chartering/$', RedirectView.as_view(url='/group/chartering/', permanent=True)),
     url(r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/', permanent=True)),
     url(r'^bofs/$', views.bofs),
-    url(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
+    url(r'^email-aliases/$', views.email_aliases),
     url(r'^bofs/create/$', views_edit.edit, {'action': "create", }, "bof_create"),
     url(r'^photos/$', views.chair_photos),
     url(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),

ietf/group/urls_info_details.py

@@ -1,40 +1,43 @@
 from django.conf.urls import url
 from django.views.generic import RedirectView
-from ietf.group import views, views_review
+
+from ietf.community import views as community_views
+from ietf.doc import views_material as material_views
+from ietf.group import views, views_edit, views_review, milestones as milestone_views
 
 urlpatterns = [
-    url(r'^$', 'ietf.group.views.group_home', None, "group_home"),
-    url(r'^documents/txt/$', 'ietf.group.views.group_documents_txt'),
-    url(r'^documents/$', 'ietf.group.views.group_documents', None, "group_docs"),
-    url(r'^documents/manage/$', 'ietf.community.views.manage_list'),
-    url(r'^documents/csv/$', 'ietf.community.views.export_to_csv'),
-    url(r'^documents/feed/$', 'ietf.community.views.feed'),
-    url(r'^documents/subscription/$', 'ietf.community.views.subscription'),
-    url(r'^charter/$', 'ietf.group.views.group_about', None, 'group_charter'),
-    url(r'^about/$', 'ietf.group.views.group_about', None, 'group_about'),
-    url(r'^about/status/$', 'ietf.group.views.group_about_status'),
-    url(r'^about/status/edit/$', 'ietf.group.views.group_about_status_edit'),
-    url(r'^about/status/meeting/(?P<num>\d+)/$', 'ietf.group.views.group_about_status_meeting'),
-    url(r'^history/$','ietf.group.views.history'),
-    url(r'^email/$', 'ietf.group.views.email'),
-    url(r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.views.dependencies'),
-    url(r'^meetings/$', 'ietf.group.views.meetings'),
-    url(r'^edit/$', 'ietf.group.views_edit.edit', {'action': "edit"}, "group_edit"),
-    url(r'^conclude/$', 'ietf.group.views_edit.conclude'),
-    url(r'^milestones/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "current"}, "group_edit_milestones"),
-    url(r'^milestones/charter/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "charter"}, "group_edit_charter_milestones"),
-    url(r'^milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"),
-    url(r'^workflow/$', 'ietf.group.views_edit.customize_workflow'),
-    url(r'^materials/$', 'ietf.group.views.materials', None, "group_materials"),
-    url(r'^materials/new/$', 'ietf.doc.views_material.choose_material_type'),
-    url(r'^materials/new/(?P<doc_type>[\w-]+)/$', 'ietf.doc.views_material.edit_material', { 'action': "new" }, "group_new_material"),
-    url(r'^archives/$', 'ietf.group.views.derived_archives'),
+    url(r'^$', views.group_home, None, "group_home"),
+    url(r'^documents/txt/$', views.group_documents_txt),
+    url(r'^documents/$', views.group_documents, None, "group_docs"),
+    url(r'^documents/manage/$', community_views.manage_list),
+    url(r'^documents/csv/$', community_views.export_to_csv),
+    url(r'^documents/feed/$', community_views.feed),
+    url(r'^documents/subscription/$', community_views.subscription),
+    url(r'^charter/$', views.group_about, None, 'group_charter'),
+    url(r'^about/$', views.group_about, None, 'group_about'),
+    url(r'^about/status/$', views.group_about_status),
+    url(r'^about/status/edit/$', views.group_about_status_edit),
+    url(r'^about/status/meeting/(?P<num>\d+)/$', views.group_about_status_meeting),
+    url(r'^history/$',views.history),
+    url(r'^email/$', views.email),
+    url(r'^deps/(?P<output_type>[\w-]+)/$', views.dependencies),
+    url(r'^meetings/$', views.meetings),
+    url(r'^edit/$', views_edit.edit, {'action': "edit"}, "group_edit"),
+    url(r'^conclude/$', views_edit.conclude),
+    url(r'^milestones/$', milestone_views.edit_milestones, {'milestone_set': "current"}, "group_edit_milestones"),
+    url(r'^milestones/charter/$', milestone_views.edit_milestones, {'milestone_set': "charter"}, "group_edit_charter_milestones"),
+    url(r'^milestones/charter/reset/$', milestone_views.reset_charter_milestones, None, "group_reset_charter_milestones"),
+    url(r'^workflow/$', views_edit.customize_workflow),
+    url(r'^materials/$', views.materials, None, "group_materials"),
+    url(r'^materials/new/$', material_views.choose_material_type),
+    url(r'^materials/new/(?P<doc_type>[\w-]+)/$', material_views.edit_material, { 'action': "new" }, "group_new_material"),
+    url(r'^archives/$', views.derived_archives),
     url(r'^photos/$', views.group_photos),
     url(r'^reviews/$', views_review.review_requests),
     url(r'^reviews/manage/(?P<assignment_status>assigned|unassigned)/$', views_review.manage_review_requests),
     url(r'^reviews/email-assignments/$', views_review.email_open_review_assignments),
     url(r'^reviewers/$', views_review.reviewer_overview),
     url(r'^reviewers/(?P<reviewer_email>[\w%+-.@]+)/settings/$', views_review.change_reviewer_settings),
     url(r'^secretarysettings/$', views_review.change_review_secretary_settings),
-    url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.views.email',permanent=False),name='old_group_email_aliases'),
+    url(r'^email-aliases/$', RedirectView.as_view(pattern_name=views.email,permanent=False),name='old_group_email_aliases'),
 ]