From 6f044eea08e745fc2d656c1e57f13cb64482e173 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Thu, 1 Oct 2015 14:16:16 +0000
Subject: [PATCH] Summary: Move definition of document names and group acronyms
 to settings.URL_REGEXPS, partly to cleanup the urls.py files, partly to make
 sure that all URL patterns agree on what constitutes a name  - Legacy-Id:
 10114

---
 ietf/doc/tests_status_change.py               |  2 +-
 ietf/doc/urls.py                              | 95 ++++++++++---------
 ietf/doc/urls_charter.py                      |  3 +-
 ietf/doc/urls_material.py                     | 25 ++---
 ietf/feed_urls.py                             |  5 +-
 ietf/group/urls.py                            |  7 +-
 ietf/group/urls_info.py                       |  3 +-
 ietf/group/urls_stream.py                     |  5 +-
 ietf/iesg/urls.py                             | 15 +--
 ietf/meeting/urls.py                          | 11 ++-
 ietf/secr/groups/urls.py                      | 15 +--
 ietf/secr/proceedings/urls.py                 |  7 +-
 ietf/secr/roles/urls.py                       |  5 +-
 ietf/secr/sreq/urls.py                        | 19 ++--
 ietf/settings.py                              |  7 ++
 .../doc/status_change/status_changes.html     |  2 +-
 16 files changed, 123 insertions(+), 103 deletions(-)

diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index 792a83b70..a38827ccc 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -23,7 +23,7 @@ from ietf.utils.test_utils import login_testing_unauthorized
 class StatusChangeTests(TestCase):
     def test_start_review(self):
 
-        url = urlreverse('start_rfc_status_change',kwargs=dict(name=""))
+        url = urlreverse('start_rfc_status_change')
         login_testing_unauthorized(self, "secretary", url)
 
         # normal get should succeed and get a reasonable form
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index d9d8489ec..50ed97c39 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -32,6 +32,7 @@
 
 from django.conf.urls import patterns, url, include
 from django.views.generic import RedirectView
+from django.conf import settings
 
 from ietf.doc import views_search, views_draft, views_ballot
 from ietf.doc import views_status_change
@@ -44,7 +45,7 @@ urlpatterns = patterns('',
     url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.docs_for_ad, name="docs_for_ad"),
     (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'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, 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"),
     url(r'^email-aliases/$', views_doc.email_aliases),
 
@@ -52,61 +53,61 @@ urlpatterns = patterns('',
     url(r'^active/$', views_search.index_active_drafts, name="index_active_drafts"),
     url(r'^select2search/(?P<model_name>(document|docalias))/(?P<doc_type>draft)/$', views_search.ajax_select2_search_docs, name="ajax_select2_search_docs"),
 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/(?:(?P<rev>[0-9-]+)/)?$', views_doc.document_main, name="doc_view"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/history/$', views_doc.document_history, name="doc_history"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/writeup/$', views_doc.document_writeup, name="doc_writeup"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/shepherdwriteup/$', views_doc.document_shepherd_writeup, name="doc_shepherd_writeup"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/references/$', views_doc.document_references, name="doc_references"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/referencedby/$', views_doc.document_referenced_by, name="doc_referenced_by"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/(?P<ballot_id>[0-9]+)/position/$', views_ballot.edit_position),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/(?P<ballot_id>[0-9]+)/emailposition/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/(?P<ballot_id>[0-9]+)/$', views_doc.document_ballot, name="doc_ballot"),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_json),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/ballotpopup/(?P<ballot_id>[0-9]+)/$', views_doc.ballot_popup),
+    url(r'^%(name)s/(?:%(rev)s/)?$' % settings.URL_REGEXPS, views_doc.document_main, name="doc_view"),
+    url(r'^%(name)s/history/$' % settings.URL_REGEXPS, views_doc.document_history, name="doc_history"),
+    url(r'^%(name)s/writeup/$' % settings.URL_REGEXPS, views_doc.document_writeup, name="doc_writeup"),
+    url(r'^%(name)s/shepherdwriteup/$' % settings.URL_REGEXPS, views_doc.document_shepherd_writeup, name="doc_shepherd_writeup"),
+    url(r'^%(name)s/references/$' % settings.URL_REGEXPS, views_doc.document_references, name="doc_references"),
+    url(r'^%(name)s/referencedby/$' % settings.URL_REGEXPS, views_doc.document_referenced_by, name="doc_referenced_by"),
+    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/position/$' % settings.URL_REGEXPS, views_ballot.edit_position),
+    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
+    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot, name="doc_ballot"),
+    url(r'^%(name)s/ballot/$' % settings.URL_REGEXPS, views_doc.document_ballot, name="doc_ballot"),
+    (r'^%(name)s/doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
+    (r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/email-aliases/$', views_doc.email_aliases),
+    url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, views_doc.email_aliases),
 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/$', views_draft.change_state, name='doc_change_state'), # IESG state
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/(?P<state_type>iana-action|iana-review)/$', views_draft.change_iana_state, name='doc_change_iana_state'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/info/$', views_draft.edit_info, name='doc_edit_info'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/requestresurrect/$', views_draft.request_resurrect, name='doc_request_resurrect'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/submit-to-iesg/$', views_draft.to_iesg, name='doc_to_iesg'), 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/resurrect/$', views_draft.resurrect, name='doc_resurrect'),                       
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/addcomment/$', views_doc.add_comment, name='doc_add_comment'),
+    url(r'^%(name)s/edit/state/$' % settings.URL_REGEXPS, views_draft.change_state, name='doc_change_state'), # IESG state
+    url(r'^%(name)s/edit/state/(?P<state_type>iana-action|iana-review)/$' % settings.URL_REGEXPS, views_draft.change_iana_state, name='doc_change_iana_state'),
+    url(r'^%(name)s/edit/info/$' % settings.URL_REGEXPS, views_draft.edit_info, name='doc_edit_info'),
+    url(r'^%(name)s/edit/requestresurrect/$' % settings.URL_REGEXPS, views_draft.request_resurrect, name='doc_request_resurrect'),
+    url(r'^%(name)s/edit/submit-to-iesg/$' % settings.URL_REGEXPS, views_draft.to_iesg, name='doc_to_iesg'),
+    url(r'^%(name)s/edit/resurrect/$' % settings.URL_REGEXPS, views_draft.resurrect, name='doc_resurrect'),
+    url(r'^%(name)s/edit/addcomment/$' % settings.URL_REGEXPS, views_doc.add_comment, name='doc_add_comment'),
     url(r'^ajax/internet_draft/?$', views_draft.doc_ajax_internet_draft, name="doc_ajax_internet_draft"),
 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/stream/$', views_draft.change_stream, name='doc_change_stream'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/replaces/$', views_draft.replaces, name='doc_change_replaces'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/notify/$', views_doc.edit_notify, name='doc_change_notify'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/suggested-replaces/$', views_draft.review_possibly_replaces, name='doc_review_possibly_replaces'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/status/$', views_draft.change_intention, name='doc_change_intended_status'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/telechat/$', views_doc.telechat_date, name='doc_change_telechat_date'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/iesgnote/$', views_draft.edit_iesg_note, name='doc_change_iesg_note'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/ad/$', views_draft.edit_ad, name='doc_change_ad'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/consensus/$', views_draft.edit_consensus, name='doc_edit_consensus'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherd/$', views_draft.edit_shepherd, name='doc_edit_shepherd'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherdemail/$', views_draft.change_shepherd_email, name='doc_change_shepherd_email'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherdwriteup/$', views_draft.edit_shepherd_writeup, name='doc_edit_shepherd_writeup'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/requestpublication/$', views_draft.request_publication, name='doc_request_publication'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/adopt/$', views_draft.adopt_draft, name='doc_adopt_draft'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/(?P<state_type>draft-stream-[a-z]+)/$', views_draft.change_stream_state, name='doc_change_stream_state'),
+    url(r'^%(name)s/edit/stream/$' % settings.URL_REGEXPS, views_draft.change_stream, name='doc_change_stream'),
+    url(r'^%(name)s/edit/replaces/$' % settings.URL_REGEXPS, views_draft.replaces, name='doc_change_replaces'),
+    url(r'^%(name)s/edit/notify/$' % settings.URL_REGEXPS, views_doc.edit_notify, name='doc_change_notify'),
+    url(r'^%(name)s/edit/suggested-replaces/$' % settings.URL_REGEXPS, views_draft.review_possibly_replaces, name='doc_review_possibly_replaces'),
+    url(r'^%(name)s/edit/status/$' % settings.URL_REGEXPS, views_draft.change_intention, name='doc_change_intended_status'),
+    url(r'^%(name)s/edit/telechat/$' % settings.URL_REGEXPS, views_doc.telechat_date, name='doc_change_telechat_date'),
+    url(r'^%(name)s/edit/iesgnote/$' % settings.URL_REGEXPS, views_draft.edit_iesg_note, name='doc_change_iesg_note'),
+    url(r'^%(name)s/edit/ad/$' % settings.URL_REGEXPS, views_draft.edit_ad, name='doc_change_ad'),
+    url(r'^%(name)s/edit/consensus/$' % settings.URL_REGEXPS, views_draft.edit_consensus, name='doc_edit_consensus'),
+    url(r'^%(name)s/edit/shepherd/$' % settings.URL_REGEXPS, views_draft.edit_shepherd, name='doc_edit_shepherd'),
+    url(r'^%(name)s/edit/shepherdemail/$' % settings.URL_REGEXPS, views_draft.change_shepherd_email, name='doc_change_shepherd_email'),
+    url(r'^%(name)s/edit/shepherdwriteup/$' % settings.URL_REGEXPS, views_draft.edit_shepherd_writeup, name='doc_edit_shepherd_writeup'),
+    url(r'^%(name)s/edit/requestpublication/$' % settings.URL_REGEXPS, views_draft.request_publication, name='doc_request_publication'),
+    url(r'^%(name)s/edit/adopt/$' % settings.URL_REGEXPS, views_draft.adopt_draft, name='doc_adopt_draft'),
+    url(r'^%(name)s/edit/state/(?P<state_type>draft-stream-[a-z]+)/$' % settings.URL_REGEXPS, views_draft.change_stream_state, name='doc_change_stream_state'),
 
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/clearballot/$', views_ballot.clear_ballot, name='doc_clear_ballot'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/deferballot/$', views_ballot.defer_ballot, name='doc_defer_ballot'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/undeferballot/$', views_ballot.undefer_ballot, name='doc_undefer_ballot'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/lastcalltext/$', views_ballot.lastcalltext, name='doc_ballot_lastcall'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/ballotwriteupnotes/$', views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/approvaltext/$', views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/approveballot/$', views_ballot.approve_ballot, name='doc_approve_ballot'),
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/makelastcall/$', views_ballot.make_last_call, name='doc_make_last_call'),
+    url(r'^%(name)s/edit/clearballot/$' % settings.URL_REGEXPS, views_ballot.clear_ballot, name='doc_clear_ballot'),
+    url(r'^%(name)s/edit/deferballot/$' % settings.URL_REGEXPS, views_ballot.defer_ballot, name='doc_defer_ballot'),
+    url(r'^%(name)s/edit/undeferballot/$' % settings.URL_REGEXPS, views_ballot.undefer_ballot, name='doc_undefer_ballot'),
+    url(r'^%(name)s/edit/lastcalltext/$' % settings.URL_REGEXPS, views_ballot.lastcalltext, name='doc_ballot_lastcall'),
+    url(r'^%(name)s/edit/ballotwriteupnotes/$' % settings.URL_REGEXPS, views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'),
+    url(r'^%(name)s/edit/approvaltext/$' % settings.URL_REGEXPS, views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'),
+    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"),
 
     (r'^(?P<name>charter-[A-Za-z0-9._+-]+)/', include('ietf.doc.urls_charter')),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/conflict-review/', include('ietf.doc.urls_conflict_review')),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/status-change/', include('ietf.doc.urls_status_change')),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/material/', include('ietf.doc.urls_material')),
+    (r'^%(name)s/conflict-review/' % settings.URL_REGEXPS, include('ietf.doc.urls_conflict_review')),
+    (r'^%(name)s/status-change/' % settings.URL_REGEXPS, include('ietf.doc.urls_status_change')),
+    (r'^%(name)s/material/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
 )
diff --git a/ietf/doc/urls_charter.py b/ietf/doc/urls_charter.py
index 9384e5cbc..8ed97df53 100644
--- a/ietf/doc/urls_charter.py
+++ b/ietf/doc/urls_charter.py
@@ -1,6 +1,7 @@
 # Copyright The IETF Trust 2011, All Rights Reserved
 
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('',
     url(r'^state/$', "ietf.doc.views_charter.change_state", name='charter_change_state'),
@@ -13,5 +14,5 @@ urlpatterns = patterns('',
     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-(?P<rev>[0-9-]+).txt$', "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
+    url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
 )
diff --git a/ietf/doc/urls_material.py b/ietf/doc/urls_material.py
index 40fb7fd6c..688134737 100644
--- a/ietf/doc/urls_material.py
+++ b/ietf/doc/urls_material.py
@@ -1,21 +1,22 @@
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('ietf.doc.views_material',
     url(r'^(?P<action>state|title|abstract|revise)/$', "edit_material", name="material_edit"),
     url(r'^sessions/$', "material_presentations", name="material_presentations"),
     (r'^sessions/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/edit/$',  "edit_material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<seq>\d+)/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<week_day>[a-zA-Z]+)/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/edit/$' % settings.URL_REGEXPS,  "edit_material_presentations"),
     (r'^sessions/(?P<seq>\d+)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$',  "material_presentations"),
-    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$',  "material_presentations"),
+    (r'^sessions/%(acronym)s/$' % settings.URL_REGEXPS,  "material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<seq>\d+)/$' % settings.URL_REGEXPS,  "material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<week_day>[a-zA-Z]+)/$' % settings.URL_REGEXPS,  "material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/$' % settings.URL_REGEXPS,  "material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$' % settings.URL_REGEXPS,  "material_presentations"),
+    (r'^sessions/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$' % settings.URL_REGEXPS,  "material_presentations"),
 )
 
diff --git a/ietf/feed_urls.py b/ietf/feed_urls.py
index eea94dc7b..e697fd1a6 100644
--- a/ietf/feed_urls.py
+++ b/ietf/feed_urls.py
@@ -1,5 +1,6 @@
 from django.conf.urls import patterns
 from django.views.generic import RedirectView
+from django.conf import settings
 
 from ietf.doc.feeds import DocumentChangesFeed, InLastCallFeed
 from ietf.group.feeds import GroupChangesFeed
@@ -11,9 +12,9 @@ from ietf.meeting.feeds import LatestMeetingMaterialFeed
 urlpatterns = patterns(
     '',
     (r'^comments/(?P<remainder>.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/')),
-    (r'^document-changes/(?P<name>[A-Za-z0-9._+-]+)/$', DocumentChangesFeed()),
+    (r'^document-changes/%(name)s/$' % settings.URL_REGEXPS, DocumentChangesFeed()),
     (r'^last-call/$', InLastCallFeed()),
-    (r'^group-changes/(?P<acronym>[a-zA-Z0-9-]+)/$', GroupChangesFeed()),
+    (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()),
diff --git a/ietf/group/urls.py b/ietf/group/urls.py
index 00124a3a7..3d95a2864 100644
--- a/ietf/group/urls.py
+++ b/ietf/group/urls.py
@@ -1,18 +1,19 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.conf.urls import patterns, include
+from django.conf import settings
 
 urlpatterns = patterns('',
     (r'^$', 'ietf.group.info.active_groups'), 
     (r'^groupmenu.json', 'ietf.group.ajax.group_menu_data', None, "group_menu_data"),
-    (r'^(?P<acronym>[a-z0-9]+).json$', 'ietf.group.ajax.group_json'),
+    (r'^%(acronym)s.json$' % settings.URL_REGEXPS, 'ietf.group.ajax.group_json'),
     (r'^chartering/$', 'ietf.group.info.chartering_groups'),
     (r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.edit.edit', {'action': "charter"}, "group_create"),
     (r'^concluded/$', 'ietf.group.info.concluded_groups'),
     (r'^email-aliases/$', 'ietf.group.info.email_aliases'),
 
-    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"),
-    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
+    (r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.group.info.group_home', None, "group_home"),
+    (r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
 )
 
 
diff --git a/ietf/group/urls_info.py b/ietf/group/urls_info.py
index 581509d8d..186544b61 100644
--- a/ietf/group/urls_info.py
+++ b/ietf/group/urls_info.py
@@ -2,6 +2,7 @@
 
 from django.conf.urls import patterns, include
 from django.views.generic import RedirectView
+from django.conf import settings
 
 from ietf.group import info, edit
 
@@ -19,5 +20,5 @@ urlpatterns = patterns('',
     (r'^bofs/$', info.bofs),
     (r'^email-aliases/$', 'ietf.group.info.email_aliases'),
     (r'^bofs/create/$', edit.edit, {'action': "create"}, "bof_create"),
-    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
+    (r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
 )
diff --git a/ietf/group/urls_stream.py b/ietf/group/urls_stream.py
index 3d9712b4b..8559212de 100644
--- a/ietf/group/urls_stream.py
+++ b/ietf/group/urls_stream.py
@@ -1,11 +1,12 @@
 # Copyright The IETF Trust 2008, All Rights Reserved
 
 from django.conf.urls import patterns
+from django.conf import settings
 
 import views_stream
 
 urlpatterns = patterns('',
      (r'^$', views_stream.streams),
-     (r'^(?P<acronym>[a-zA-Z0-9-]+)/$', views_stream.stream_documents, None),
-     (r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', views_stream.stream_edit),
+     (r'^%(acronym)s/$' % settings.URL_REGEXPS, views_stream.stream_documents, None),
+     (r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views_stream.stream_edit),
 )
diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py
index b534d4ed0..3afa72d29 100644
--- a/ietf/iesg/urls.py
+++ b/ietf/iesg/urls.py
@@ -34,6 +34,7 @@
 
 from django.conf.urls import patterns
 from django.views.generic import RedirectView
+from django.conf import settings
 
 urlpatterns = patterns('',
     (r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html')),
@@ -41,16 +42,16 @@ urlpatterns = patterns('',
     (r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/')),
 
     (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/(?:%(date)s/)?$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda"),
+    (r'^agenda/(?:%(date)s/)?agenda.txt$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_txt"),
+    (r'^agenda/(?:%(date)s/)?agenda.json$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_json"),
+    (r'^agenda/(?:%(date)s/)?scribe_template.html$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_scribe_template"),
+    (r'^agenda/(?:%(date)s/)?moderator_package.html$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_moderator_package"),
+    (r'^agenda/(?:%(date)s/)?agenda_package.txt$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_package"),
 
     (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'^agenda/telechat-(?:%(date)s-)?docs.tgz' % settings.URL_REGEXPS, "ietf.iesg.views.telechat_docs_tarfile"),
     (r'^discusses/$', "ietf.iesg.views.discusses"),
     (r'^milestones/$', "ietf.iesg.views.milestones_needing_review"),
 )
diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index 8fce21cff..034c6546e 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -2,6 +2,7 @@
 
 from django.conf.urls import patterns
 from django.views.generic import RedirectView
+from django.conf import settings
 
 from ietf.meeting import views
 from ietf.meeting import ajax
@@ -60,11 +61,11 @@ urlpatterns = patterns('',
     (r'^(?P<num>\d+)/session/(?P<sessionid>\d+).json',             ajax.session_json),
     (r'^(?P<num>\d+)/session/(?P<sessionid>\d+)/constraints.json', ajax.session_constraints),
 
-    (r'^(?P<num>\d+)/session/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',  views.session_details),
-    (r'^(?P<num>\d+)/session/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/$',  views.session_details),
-    (r'^(?P<num>\d+)/session/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/$',  views.session_details),
-    (r'^(?P<num>\d+)/session/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$',  views.session_details),
-    (r'^(?P<num>\d+)/session/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$',  views.session_details),
+    (r'^(?P<num>\d+)/session/%(acronym)s/$' % settings.URL_REGEXPS,  views.session_details),
+    (r'^(?P<num>\d+)/session/%(acronym)s/(?P<seq>\d+)/$' % settings.URL_REGEXPS,  views.session_details),
+    (r'^(?P<num>\d+)/session/%(acronym)s/(?P<week_day>[a-zA-Z]+)/$' % settings.URL_REGEXPS,  views.session_details),
+    (r'^(?P<num>\d+)/session/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$' % settings.URL_REGEXPS,  views.session_details),
+    (r'^(?P<num>\d+)/session/%(acronym)s/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$' % settings.URL_REGEXPS,  views.session_details),
 
     (r'^(?P<num>\d+)/constraint/(?P<constraintid>\d+).json',       ajax.constraint_json),
     (r'^(?P<num>\d+).json$',                               ajax.meeting_json),
diff --git a/ietf/secr/groups/urls.py b/ietf/secr/groups/urls.py
index 41793b701..5c77571a7 100644
--- a/ietf/secr/groups/urls.py
+++ b/ietf/secr/groups/urls.py
@@ -1,4 +1,5 @@
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('ietf.secr.groups.views',
     url(r'^$', 'search', name='groups'),
@@ -6,11 +7,11 @@ urlpatterns = patterns('ietf.secr.groups.views',
     url(r'^blue-dot-report/$', 'blue_dot', name='groups_blue_dot'),
     url(r'^search/$', 'search', name='groups_search'),
     #(r'^ajax/get_ads/$', 'get_ads'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/$', 'view', name='groups_view'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/delete/(?P<id>\d{1,6})/$', 'delete_role', name='groups_delete_role'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/charter/$', 'charter', name='groups_charter'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/edit/$', 'edit', name='groups_edit'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/gm/$', 'view_gm', name='groups_view_gm'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/gm/edit/$', 'edit_gm', name='groups_edit_gm'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/people/$', 'people', name='groups_people'),
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'view', name='groups_view'),
+    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, 'delete_role', name='groups_delete_role'),
+    url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, 'charter', name='groups_charter'),
+    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, 'edit', name='groups_edit'),
+    url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, 'view_gm', name='groups_view_gm'),
+    url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, 'edit_gm', name='groups_edit_gm'),
+    url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, 'people', name='groups_people'),
 )
diff --git a/ietf/secr/proceedings/urls.py b/ietf/secr/proceedings/urls.py
index f7fdd2db2..425c86cd6 100644
--- a/ietf/secr/proceedings/urls.py
+++ b/ietf/secr/proceedings/urls.py
@@ -1,9 +1,10 @@
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('ietf.secr.proceedings.views',
     url(r'^$', 'main', name='proceedings'),
     url(r'^ajax/generate-proceedings/(?P<meeting_num>\d{1,3})/$', 'ajax_generate_proceedings', name='proceedings_ajax_generate_proceedings'),
-    url(r'^ajax/get-sessions/(?P<meeting_num>\d{1,3})/(?P<acronym>[A-Za-z0-9_\-\+]+)/', 'ajax_get_sessions', name='proceedings_ajax_get_sessions'),
+    url(r'^ajax/get-sessions/(?P<meeting_num>\d{1,3})/%(acronym)s/' % settings.URL_REGEXPS, 'ajax_get_sessions', name='proceedings_ajax_get_sessions'),
     url(r'^ajax/order-slide/$', 'ajax_order_slide', name='proceedings_ajax_order_slide'),
     # special offline URL for testing proceedings build
     url(r'^build/(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',
@@ -21,11 +22,11 @@ urlpatterns = patterns('ietf.secr.proceedings.views',
     # NOTE: we have two entries here which both map to upload_unified, passing session_id or acronym
     url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<session_id>\d{1,6})/$',
         'upload_unified', name='proceedings_upload_unified'),
-    url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',
+    url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
         'upload_unified', name='proceedings_upload_unified'),
     # interim stuff
     url(r'^interim/$', 'select_interim', name='proceedings_select_interim'),
     url(r'^interim/(?P<meeting_num>interim-\d{4}-[A-Za-z0-9_\-\+]+)/delete/$', 'delete_interim_meeting',
         name='proceedings_delete_interim_meeting'),
-    url(r'^interim/(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'interim', name='proceedings_interim'),
+    url(r'^interim/%(acronym)s/$' % settings.URL_REGEXPS, 'interim', name='proceedings_interim'),
 )
diff --git a/ietf/secr/roles/urls.py b/ietf/secr/roles/urls.py
index 29a27b0da..6a2d566a0 100644
--- a/ietf/secr/roles/urls.py
+++ b/ietf/secr/roles/urls.py
@@ -1,7 +1,8 @@
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('ietf.secr.roles.views',
     url(r'^$', 'main', name='roles'),
-    url(r'^ajax/get-roles/(?P<acronym>[A-Za-z0-9_\-\+\.]+)/$', 'ajax_get_roles', name='roles_ajax_get_roles'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+\.]+)/delete/(?P<id>\d{1,6})/$', 'delete_role', name='roles_delete_role'),
+    url(r'^ajax/get-roles/%(acronym)s/$' % settings.URL_REGEXPS, 'ajax_get_roles', name='roles_ajax_get_roles'),
+    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, 'delete_role', name='roles_delete_role'),
 )
diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py
index 3159bae78..5e79a9199 100644
--- a/ietf/secr/sreq/urls.py
+++ b/ietf/secr/sreq/urls.py
@@ -1,15 +1,16 @@
 from django.conf.urls import patterns, url
+from django.conf import settings
 
 urlpatterns = patterns('ietf.secr.sreq.views',
     url(r'^$', 'main', name='sessions'),
     url(r'^status/$', 'tool_status', name='sessions_tool_status'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/view/$', 'view', name='sessions_view'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/approve/$', 'approve', name='sessions_approve'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/cancel/$', 'cancel', name='sessions_cancel'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/confirm/$', 'confirm', name='sessions_confirm'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/edit/$', 'edit', name='sessions_edit'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/new/$', 'new', name='sessions_new'),
-    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/no_session/$', 'no_session', name='sessions_no_session'),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/edit/$', 'edit_mtg', name='sessions_edit'),
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'view', name='sessions_view'),
+    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, 'view', name='sessions_view'),
+    url(r'^%(acronym)s/approve/$' % settings.URL_REGEXPS, 'approve', name='sessions_approve'),
+    url(r'^%(acronym)s/cancel/$' % settings.URL_REGEXPS, 'cancel', name='sessions_cancel'),
+    url(r'^%(acronym)s/confirm/$' % settings.URL_REGEXPS, 'confirm', name='sessions_confirm'),
+    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, 'edit', name='sessions_edit'),
+    url(r'^%(acronym)s/new/$' % settings.URL_REGEXPS, 'new', name='sessions_new'),
+    url(r'^%(acronym)s/no_session/$' % settings.URL_REGEXPS, 'no_session', name='sessions_no_session'),
+    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, 'edit_mtg', name='sessions_edit'),
 )
diff --git a/ietf/settings.py b/ietf/settings.py
index ceb43e597..f06a26150 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -366,6 +366,13 @@ MAX_WG_DELEGATES = 3
 DATE_FORMAT = "Y-m-d"
 DATETIME_FORMAT = "Y-m-d H:i T"
 
+URL_REGEXPS = {
+    "acronym": r"(?P<acronym>[a-zA-Z0-9-]+)",
+    "date": r"(?P<date>\d{4}-\d{2}-\d{2})",
+    "name": r"(?P<name>[A-Za-z0-9._\+\-]+)",
+    "rev": r"(?P<rev>[0-9-]+)",
+}
+
 # Override this in settings_local.py if needed
 # *_PATH variables ends with a slash/ .
 DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/'
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index f7dced285..1c67f83f0 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -10,7 +10,7 @@
   <h1>RFC status changes</h1>
 
   {% if user|has_role:"Area Director,Secretariat" %}
-    <p><a class="btn btn-default" href="{% url "start_rfc_status_change" name='' %}">New RFC status change</a></p>
+    <p><a class="btn btn-default" href="{% url "start_rfc_status_change" %}">New RFC status change</a></p>
   {% endif %}
 
   {% regroup docs by get_state as state_groups %}