Port to new class-based generic redirect and simple template views, remove utils.lazy.reverse_lazy, it's now included in Django

 - Legacy-Id: 6878

Author: OleLaursen

ietf/community/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('ietf.community.views',

ietf/cookies/urls.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 from ietf.cookies import views
 
 urlpatterns = patterns('',

ietf/dbtemplate/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('ietf.dbtemplate.views',

ietf/doc/redirect_drafts_urls.py

@@ -1,23 +1,21 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.conf import settings
-from django.conf.urls.defaults import patterns
-
-
+from django.conf.urls import patterns
+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
 
 urlpatterns = patterns('',
-     (r'^$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/'}),
-     (r'^all/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/'}),
-     (r'^rfc/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#rfc'}),
-     (r'^dead/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#expired'}),
-     (r'^current/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/active/'}),
-     (r'^(?P<object_id>\d+)/(related/)?$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/' }),
-     (r'^(?P<name>[^/]+)/(related/)?$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/%(name)s/' }),
+     (r'^$', RedirectView.as_view(url='/doc/')),
+     (r'^all/$', RedirectView.as_view(url='/doc/all/')),
+     (r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc')),
+     (r'^dead/$', RedirectView.as_view(url='/doc/all/#expired')),
+     (r'^current/$', RedirectView.as_view(url='/doc/active/')),
+     (r'^(?P<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/')),
+     (r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/')),
      (r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
-     (r'^wg/(?P<acronym>[^/]+)/$', 'django.views.generic.simple.redirect_to', { 'url': '/wg/%(acronym)s/' }),
-     (r'^all_id(?:_txt)?.html$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/id/all_id.txt' }),
+     (r'^wg/(?P<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')),
+     (r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='http://www.ietf.org/id/all_id.txt')),
 )

ietf/doc/redirect_idtracker_urls.py

@@ -1,13 +1,13 @@
-from django.conf.urls.defaults import patterns, url
-from django.views.generic.simple import redirect_to
+from django.conf.urls import patterns, url
+from django.views.generic import RedirectView
 
 urlpatterns = patterns('',
-     (r'^help/(?:sub)?state/(?:\d+/)?$', redirect_to, {'url': '/doc/help/state/draft-iesg/' }),
-     (r'^help/evaluation/$', redirect_to, {'url':'http://www.ietf.org/iesg/voting-procedures.html' }),
-     (r'^status/$', redirect_to, {'url':'/doc/iesg/' }),
-     (r'^status/last-call/$', redirect_to, {'url':'/doc/iesg/last-call/' }),
-     (r'^rfc0*(?P<rfc_number>\d+)/$', redirect_to, {'url':'/doc/rfc%(rfc_number)s/' }),
-     (r'^(?P<name>[^/]+)/$', redirect_to, {'url':'/doc/%(name)s/' }),
-     (r'^(?P<name>[^/]+)/comment/\d+/$', redirect_to, {'url':'/doc/%(name)s/history/' }),
-     (r'^$', redirect_to, { 'url': '/doc/'}),
+    (r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(rl='/doc/help/state/draft-iesg/')),
+    (r'^help/evaluation/$', RedirectView.as_view(url='http://www.ietf.org/iesg/voting-procedures.html')),
+    (r'^status/$', RedirectView.as_view(url='/doc/iesg/')),
+    (r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/')),
+    (r'^rfc0*(?P<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/')),
+    (r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/')),
+    (r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/')),
+    (r'^$', RedirectView.as_view(url='/doc/')),
 )

ietf/doc/urls.py

@@ -30,8 +30,9 @@
 # (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.defaults import patterns, url, include
-from django.shortcuts import redirect
+from django.conf.urls import patterns, url, include
+from django.views.generic import RedirectView
+
 from ietf.doc.models import State
 from ietf.doc import views_search, views_draft, views_ballot
 from ietf.doc import views_status_change
@@ -42,14 +43,8 @@
     url(r'^search/$', views_search.search, name="doc_search"),
     url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"),
     url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.docs_for_ad, name="docs_for_ad"),
-)
-
-urlpatterns += patterns('django.views.generic.simple',
-    (r'^ad2/(?P<name>[A-Za-z0-9.-]+)/$', 'redirect_to', {'url': '/doc/ad/%(name)s/', 'permanent': True}),
-)
-
-urlpatterns += patterns('',
-    url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'), 
+    (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'^iesg/(?P<last_call_only>[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"),
 

ietf/doc/urls_conflict_review.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.doc.views_conflict_review',
     url(r'^state/$',                 "change_state",  name='conflict_review_change_state'),

ietf/doc/urls_status_change.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.doc.views_status_change',
     url(r'^state/$',                 "change_state",   name='status_change_change_state'),

ietf/group/admin.py

@@ -42,7 +42,7 @@ def role_list(self, obj):
 
     # SDO reminder
     def get_urls(self):
-        from django.conf.urls.defaults import patterns, url
+        from django.conf.urls import patterns, url
 
         def wrap(view):
             def wrapper(*args, **kwargs):

ietf/group/stream_urls.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2008, All Rights Reserved
 
-from django.conf.urls.defaults import patterns, include
+from django.conf.urls import patterns, include
 
 import views_stream