Merged in Django 1.9 upgrade work from ^/personal/henrik/6.41.1-django-1.9

 - Legacy-Id: 12764

Author: levkowetz

ietf/api/__init__.py

@@ -47,29 +47,29 @@ def to_html(self, data, options=None):
         available to a browser. This is on the TODO list but not currently
         implemented.
         """
-        from django.template.loader import render_to_string as render
+        from django.template.loader import render_to_string
 
         options = options or {}
 
         serialized = self.to_simple_html(data, options)
-        return render("api/base.html", {"data": serialized})
+        return render_to_string("api/base.html", {"data": serialized})
 
     def to_simple_html(self, data, options):
         """
         """
-        from django.template.loader import render_to_string as render
+        from django.template.loader import render_to_string
         #
         if isinstance(data, (list, tuple)):
-            return render("api/listitem.html", {"data": [self.to_simple_html(item, options) for item in data]})
+            return render_to_string("api/listitem.html", {"data": [self.to_simple_html(item, options) for item in data]})
         if isinstance(data, dict):
-            return render("api/dictitem.html", {"data": dict((key, self.to_simple_html(val, options)) for (key, val) in data.items())})
+            return render_to_string("api/dictitem.html", {"data": dict((key, self.to_simple_html(val, options)) for (key, val) in data.items())})
         elif isinstance(data, Bundle):
-            return render("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())})
+            return render_to_string("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())})
         elif hasattr(data, 'dehydrated_type'):
             if getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == False:
-                return render("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)})
+                return render_to_string("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)})
             elif getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == True:
-                render("api/listitem.html", {"data": [self.to_simple_html(bundle, options) for bundle in data.m2m_bundles]})
+                render_to_string("api/listitem.html", {"data": [self.to_simple_html(bundle, options) for bundle in data.m2m_bundles]})
             else:
                 return self.to_simple_html(data.value, options)
         elif isinstance(data, datetime.datetime):
@@ -85,7 +85,7 @@ def to_simple_html(self, data, options):
         elif data is None:
             return None
         elif isinstance(data, basestring) and data.startswith("/api/v1/"):  # XXX Will not work for Python 3
-            return render("api/relitem.html", {"fk": data, "val": data.split('/')[-2]})
+            return render_to_string("api/relitem.html", {"fk": data, "val": data.split('/')[-2]})
         else:
             return force_text(data)
 

ietf/community/urls.py

@@ -1,13 +1,12 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 
-urlpatterns = patterns('',
+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'),
-
-)
+]

ietf/cookies/urls.py

@@ -1,16 +1,16 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.conf.urls import patterns
+from django.conf.urls import url
 from ietf.cookies import views
 
-urlpatterns = patterns('',
-     (r'^$', views.preferences),
-     (r'^new_enough/(?P<days>.+)$', views.new_enough),
-     (r'^new_enough/', views.new_enough),
-     (r'^expires_soon/(?P<days>.+)$', views.expires_soon),
-     (r'^expires_soon/', views.expires_soon),
-     (r'^full_draft/(?P<enabled>.+)$', views.full_draft),
-     (r'^full_draft/', views.full_draft),
-     (r'^left_menu/(?P<enabled>.+)$', views.left_menu),
-     (r'^left_menu/', views.left_menu),
-)
+urlpatterns = [
+    url(r'^$', views.preferences),
+    url(r'^new_enough/(?P<days>.+)$', views.new_enough),
+    url(r'^new_enough/', views.new_enough),
+    url(r'^expires_soon/(?P<days>.+)$', views.expires_soon),
+    url(r'^expires_soon/', views.expires_soon),
+    url(r'^full_draft/(?P<enabled>.+)$', views.full_draft),
+    url(r'^full_draft/', views.full_draft),
+    url(r'^left_menu/(?P<enabled>.+)$', views.left_menu),
+    url(r'^left_menu/', views.left_menu),
+]

ietf/cookies/views.py

@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.shortcuts import render_to_response as render
-from django.template import RequestContext
+from django.shortcuts import render
 from django.conf import settings
 
 import debug                            # pyflakes:ignore
@@ -32,7 +31,7 @@ def preferences(request, **kwargs):
             preferences[key] = settings.USER_PREFERENCE_DEFAULTS[key]
             del_cookies += [key]
     request.COOKIES.update(preferences)
-    response = render("cookies/settings.html", preferences, context_instance=RequestContext(request))
+    response = render(request, "cookies/settings.html", preferences )
     for key in new_cookies:
         response.set_cookie(key, new_cookies[key], settings.PREFERENCES_COOKIE_AGE)
     for key in del_cookies:

ietf/dbtemplate/template.py

@@ -4,8 +4,9 @@
 from docutils.utils import SystemMessage
 import debug                            # pyflakes:ignore
 
-from django.template.base import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError
-from django.template.loader import BaseLoader
+from django.template import loaders
+from django.template.base import Template as DjangoTemplate, TemplateEncodingError
+from django.template.exceptions import TemplateDoesNotExist
 from django.utils.encoding import smart_unicode
 
 from ietf.dbtemplate.models import DBTemplate
@@ -60,9 +61,9 @@ def render(self, context):
             e.args = tuple(args)
             raise e
 
-class Loader(BaseLoader):
-    def __init__(self, *args, **kwargs):
-        super(Loader, self).__init__(self, *args, **kwargs)
+class Loader(loaders.base.Loader):
+    def __init__(self, engine):
+        super(Loader, self).__init__(engine)
         self.is_usable = True
 
     def load_template(self, template_name, template_dirs=None):
@@ -77,7 +78,7 @@ def load_template(self, template_name, template_dirs=None):
             raise TemplateDoesNotExist(template_name)
 
 
-_loader = Loader()
+_loader = Loader(engine='django')
 
 
 def load_template_source(template_name, template_dirs=None):

ietf/dbtemplate/urls.py

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

ietf/doc/admin.py

@@ -81,7 +81,7 @@ def clean(self, value):
 class DocumentForm(forms.ModelForm):
     states = StatesField(queryset=State.objects.all(), required=False)
     comment_about_changes = forms.CharField(
-        widget=forms.Textarea(attrs={'rows':10,'cols':40,'class':'vLargeTextField'}),
+        widget=forms.Textarea(attrs={'rows':10,'cols':40,'class':'vLargeTextField'}), strip=False,
         help_text="This comment about the changes made will be saved in the document history.")
 
     def __init__(self, *args, **kwargs):

ietf/doc/redirect_drafts_urls.py

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

ietf/doc/redirect_idtracker_urls.py

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

ietf/doc/tests_status_change.py

@@ -417,7 +417,6 @@ def test_initial_submission(self):
         self.assertEqual(doc.rev,u'00')
         with open(path) as f:
             self.assertEqual(f.read(),"Some initial review text\n")
-            f.close()
         self.assertTrue( "mid-review-00" in doc.latest_event(NewRevisionDocEvent).desc)
 
     def test_subsequent_submission(self):