Updated all urlpatterns to use ietf.utils.urls.url() instead of django's,

in order to autogenerate dotted path url pattern names.  Updated a number
of url reverses to use dotted path, and removed explicit url pattern names
as needed.

Changed some imports to prevent import of ietf.urls before django
initialization was complete.


Changed 3 cases of form classes being curried to functions; django 1.10
didn't accept that.

Started converting old-style middleware classes to new-style middleware
functions (incomplete).

Tweaked a nomcom decorator to preserve function names and attributes, like
a good decorator should.

Replaced the removed django templatetag 'removetags' with our own version
which uses bleach, and does sanitizing in addition to removing explicitly
mentionied html tags.

Rewrote the filename argument handling in a management command which had
broken with the upgrade.
 - Legacy-Id: 12818

Author: levkowetz

ietf/community/models.py

@@ -28,7 +28,7 @@ def get_absolute_url(self):
         if self.user:
             return urlreverse(ietf.community.views.view_list, kwargs={ 'username': self.user.username })
         elif self.group:
-            return urlreverse("group_docs", kwargs={ 'acronym': self.group.acronym })
+            return urlreverse("ietf.group.views.group_documents", kwargs={ 'acronym': self.group.acronym })
         return ""
 
 

ietf/community/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls import url
 
 
 from ietf.community import views
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^personal/(?P<username>[^/]+)/$', views.view_list),

ietf/cookies/urls.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.conf.urls import url
 from ietf.cookies import views
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^$', views.preferences),

ietf/dbtemplate/urls.py

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

ietf/doc/redirect_drafts_urls.py

@@ -1,11 +1,11 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.conf.urls import url
 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
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),

ietf/doc/redirect_idtracker_urls.py

@@ -1,6 +1,7 @@
-from django.conf.urls import url
 from django.views.generic import RedirectView
 
+from ietf.utils.urls import url
+
 urlpatterns = [
     url(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/', permanent=True)),
     url(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html', permanent=True)),

ietf/doc/tests_charter.py

@@ -559,7 +559,7 @@ def test_approve(self):
         self.assertTrue("approved" in outbox[0]['Subject'].lower())
         self.assertTrue("iesg-secretary" in outbox[0]['To'])
         body = outbox[0].get_payload()
-        for word in ["WG",   "/wg/ames/charter/",
+        for word in ["WG",   "/wg/ames/about/",
             "Charter", "/doc/charter-ietf-ames/", ]:
             self.assertIn(word, body)
         #

ietf/doc/tests_status_change.py

@@ -77,7 +77,7 @@ def test_start_review(self):
     def test_change_state(self):
 
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
-        url = urlreverse('status_change_change_state',kwargs=dict(name=doc.name))
+        url = urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name))
 
         login_testing_unauthorized(self, "ad", url)
 
@@ -432,7 +432,7 @@ def test_subsequent_submission(self):
             f.write('This is the old proposal.')
             f.close()
         # Put the old proposal into IESG review (exercises ballot tab when looking at an older revision below)
-        state_change_url = urlreverse('status_change_change_state',kwargs=dict(name=doc.name))
+        state_change_url = urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name))
         iesgeval_pk = str(State.objects.get(slug='iesgeval',type__slug='statchg').pk)
         r = self.client.post(state_change_url,dict(new_state=iesgeval_pk))
         self.assertEqual(r.status_code, 302)

ietf/doc/urls.py

@@ -30,11 +30,12 @@
 # (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 import url, include
+from django.conf.urls import include
 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, views_help
+from ietf.utils.urls import url
 
 session_patterns = [
     url(r'^add$', views_doc.add_sessionpresentation),
@@ -67,19 +68,19 @@
     url(r'^%(name)s/(?:%(rev)s/)?bibtex/$' % settings.URL_REGEXPS, views_doc.document_bibtex),
     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/email/$' % settings.URL_REGEXPS, views_doc.document_email, name="doc_email"),
+    url(r'^%(name)s/email/$' % settings.URL_REGEXPS, views_doc.document_email, name="ietf.doc.views_doc.document_email"),
     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/$' % settings.URL_REGEXPS, views_doc.document_ballot, name="doc_ballot"),
-    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),
+    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot),
     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/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
     url(r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/reviewrequest/', include("ietf.doc.urls_review")),
 
-    url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='doc_email', permanent=False),name='doc_specific_email_aliases'),
+    url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='ietf.doc.views_doc.document_email', permanent=False),name='doc_specific_email_aliases'),
 
     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'),

ietf/doc/urls_charter.py

@@ -1,9 +1,9 @@
 # Copyright The IETF Trust 2011, All Rights Reserved
 
-from django.conf.urls import url
 from django.conf import settings
 
 from ietf.doc import views_charter, views_doc
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^state/$', views_charter.change_state, name='charter_change_state'),