Cleaned up the remaining explicit url names, using dotted-paths to view

functions instead.  In all almost 700 changes.
 - Legacy-Id: 12923

Author: levkowetz

ietf/dbtemplate/urls.py

@@ -4,6 +4,6 @@
 from ietf.utils.urls import url
 
 urlpatterns = [
-    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'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.template_list),
+    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.template_edit),
 ]

ietf/doc/feeds.py

@@ -24,7 +24,7 @@ def title(self, obj):
     def link(self, obj):
 	if obj is None:
 	    raise FeedDoesNotExist
-        return urlreverse("doc_history", kwargs=dict(name=obj.canonical_name()))
+        return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name()))
 
     def subtitle(self, obj):
         return "History of change entries for %s." % obj.display_name()
@@ -47,7 +47,7 @@ def item_author_name(self, item):
 	return unicode(item.by)
 
     def item_link(self, item):
-        return urlreverse("doc_history", kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
+        return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
 
 class InLastCallFeed(Feed):
     title = "Documents in Last Call"

ietf/doc/fields.py

@@ -67,7 +67,7 @@ def prepare_value(self, value):
 
         # doing this in the constructor is difficult because the URL
         # patterns may not have been fully constructed there yet
-        self.widget.attrs["data-ajax-url"] = urlreverse("ajax_select2_search_docs", kwargs={
+        self.widget.attrs["data-ajax-url"] = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
             "doc_type": self.doc_type,
             "model_name": self.model.__name__.lower()
         })

ietf/doc/mails.py

@@ -500,7 +500,7 @@ def send_review_possibly_replaces_request(request, doc, submitter_info):
               dict(doc= doc,
                    submitter_info=submitter_info,
                    possibly_replaces=doc.related_that_doc("possibly-replaces"),
-                   review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })),
+                   review_url=settings.IDTRACKER_BASE_URL + urlreverse('ietf.doc.views_draft.review_possibly_replaces', kwargs={ "name": doc.name })),
               cc=list(cc),)
 
 def email_charter_internal_review(request, charter):

ietf/doc/templatetags/ietf_filters.py

@@ -449,7 +449,7 @@ def statehelp(state):
     "Output help icon with tooltip for state."
     from django.core.urlresolvers import reverse as urlreverse
     tooltip = escape(strip_tags(state.desc))
-    url = urlreverse("state_help", kwargs=dict(type=state.type_id)) + "#" + state.slug
+    url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type=state.type_id)) + "#" + state.slug
     return mark_safe('<a class="state-help-icon" href="%s" title="%s">?</a>' % (url, tooltip))
 
 @register.filter

ietf/doc/tests.py

@@ -40,7 +40,7 @@ class SearchTests(TestCase):
     def test_search(self):
         draft = make_test_data()
 
-        base_url = urlreverse("doc_search")
+        base_url = urlreverse('ietf.doc.views_search.search')
 
         # only show form, no search yet
         r = self.client.get(base_url)
@@ -126,72 +126,72 @@ def test_search_for_name(self):
         draft.save_with_history([DocEvent.objects.create(doc=draft, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
         # exact match
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # prefix match
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # non-prefix match
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[1:]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[1:]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # other doctypes than drafts
         doc = Document.objects.get(name='charter-ietf-mars')
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name='charter-ietf-ma')))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name='charter-ietf-ma')))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='conflict-review-').first()
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='status-change-').first()
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='agenda-').first()
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='minutes-').first()
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='slides-').first()
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         # match with revision
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev)))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev)))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
 
         # match with non-existing revision
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-09")))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-09")))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # match with revision and extension
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev + ".txt")))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev + ".txt")))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
 
         # no match
-        r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="draft-ietf-doesnotexist-42")))
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="draft-ietf-doesnotexist-42")))
         self.assertEqual(r.status_code, 302)
 
         parsed = urlparse.urlparse(r["Location"])
-        self.assertEqual(parsed.path, urlreverse("doc_search"))
+        self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search'))
         self.assertEqual(urlparse.parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42")
 
     def test_frontpage(self):
@@ -203,31 +203,31 @@ def test_frontpage(self):
     def test_drafts_pages(self):
         draft = make_test_data()
 
-        r = self.client.get(urlreverse("docs_for_ad", kwargs=dict(name=draft.ad.full_name_as_key())))
+        r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_ad', kwargs=dict(name=draft.ad.full_name_as_key())))
         self.assertEqual(r.status_code, 200)
         self.assertTrue(draft.title in unicontent(r))
 
         draft.set_state(State.objects.get(type="draft-iesg", slug="lc"))
-        r = self.client.get(urlreverse("drafts_in_last_call"))
+        r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call'))
         self.assertEqual(r.status_code, 200)
         self.assertTrue(draft.title in unicontent(r))
 
     def test_indexes(self):
         draft = make_test_data()
 
-        r = self.client.get(urlreverse("index_all_drafts"))
+        r = self.client.get(urlreverse('ietf.doc.views_search.index_all_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertTrue(draft.name in unicontent(r))
 
-        r = self.client.get(urlreverse("index_active_drafts"))
+        r = self.client.get(urlreverse('ietf.doc.views_search.index_active_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertTrue(draft.title in unicontent(r))
 
     def test_ajax_search_docs(self):
         draft = make_test_data()
 
         # Document
-        url = urlreverse("ajax_select2_search_docs", kwargs={
+        url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
             "model_name": "document",
             "doc_type": "draft",
         })
@@ -239,7 +239,7 @@ def test_ajax_search_docs(self):
         # DocAlias
         doc_alias = draft.docalias_set.get()
 
-        url = urlreverse("ajax_select2_search_docs", kwargs={
+        url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
             "model_name": "docalias",
             "doc_type": "draft",
         })
@@ -734,7 +734,7 @@ def test_writeup(self):
             text="This is a note for the RFC Editor.",
             by=Person.objects.get(name="(System)"))
 
-        url = urlreverse('doc_writeup', kwargs=dict(name=doc.name))
+        url = urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=doc.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertTrue(appr.text in unicontent(r))
@@ -750,7 +750,7 @@ def test_history(self):
             type="added_comment",
             by=Person.objects.get(name="(System)"))
 
-        url = urlreverse('doc_history', kwargs=dict(name=doc.name))
+        url = urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=doc.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertTrue(e.desc in unicontent(r))
@@ -790,7 +790,7 @@ def test_rfc_feed(self):
         self.assertTrue(r.status_code, 200)
 
     def test_state_help(self):
-        url = urlreverse('state_help', kwargs=dict(type="draft-iesg"))
+        url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="draft-iesg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertTrue(State.objects.get(type="draft-iesg", slug="lc").name in unicontent(r))
@@ -871,7 +871,7 @@ def test_document_bibtex(self):
 class AddCommentTestCase(TestCase):
     def test_add_comment(self):
         draft = make_test_data()
-        url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name))
+        url = urlreverse('ietf.doc.views_doc.add_comment', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
         # normal get
@@ -919,11 +919,11 @@ def test_references(self):
         doc1 = Document.objects.get(name='draft-ietf-mars-test')
         doc2 = DocAlias.objects.get(name='draft-imaginary-independent-submission')
         RelatedDocument.objects.get_or_create(source=doc1,target=doc2,relationship=DocRelationshipName.objects.get(slug='refnorm'))
-        url = urlreverse('doc_references', kwargs=dict(name=doc1.name))
+        url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name))
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
         self.assertTrue(doc2.name in unicontent(r))
-        url = urlreverse('doc_referenced_by', kwargs=dict(name=doc2.name))
+        url = urlreverse('ietf.doc.views_doc.document_referenced_by', kwargs=dict(name=doc2.name))
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
         self.assertTrue(doc1.name in unicontent(r))
@@ -963,7 +963,7 @@ def tearDown(self):
         os.unlink(self.doc_alias_file.name)
 
     def testAliases(self):
-        url = urlreverse('doc_specific_email_aliases', kwargs=dict(name="draft-ietf-mars-test"))
+        url = urlreverse('ietf.doc.urls.redirect.document_email', kwargs=dict(name="draft-ietf-mars-test"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 302)