Upgrade Django because #3297

.travis.yml

@@ -34,3 +34,9 @@ notifications:
       - readthedocs:y3hjODOi7EIz1JAbD1Zb41sz#random
     on_success: change
     on_failure: always
+addons:
+  apt:
+    packages:
+    - binutils
+    - libproj-dev
+    - gdal-bin

readthedocs/bookmarks/views.py

@@ -1,17 +1,18 @@
 """Views for the bookmarks app."""
 
 from __future__ import absolute_import
+
+import json
+
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.http import HttpResponseBadRequest
-from django.shortcuts import get_object_or_404, render_to_response
-from django.views.generic import ListView, View
-from django.core.urlresolvers import reverse
-from django.template import RequestContext
+from django.shortcuts import get_object_or_404, render
 from django.utils.decorators import method_decorator
-from django.core.exceptions import ObjectDoesNotExist
 from django.views.decorators.csrf import csrf_exempt
-import json
+from django.views.generic import ListView, View
 
 from readthedocs.bookmarks.models import Bookmark
 from readthedocs.projects.models import Project
@@ -161,10 +162,7 @@ def dispatch(self, request, *args, **kwargs):
         return super(BookmarkRemoveView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
-        return render_to_response(
-            'bookmarks/bookmark_delete.html',
-            context_instance=RequestContext(request)
-        )
+        return render(request, 'bookmarks/bookmark_delete.html')
 
     def post(self, request, *args, **kwargs):
         """

readthedocs/comments/views.py

@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.template import RequestContext
 from django.utils.decorators import method_decorator
 from rest_framework import permissions, status
@@ -92,9 +92,7 @@ def build(request):  # pylint: disable=unused-argument
 def serve_file(request, file):  # pylint: disable=redefined-builtin
     document = support.get_document(file)
 
-    return render_to_response('doc.html',
-                              {'document': document},
-                              context_instance=RequestContext(request))
+    return render(request, 'doc.html', {'document': document})
 
 ######
 # Called by Builder

readthedocs/core/views/__init__.py

@@ -13,8 +13,7 @@
 
 from django.conf import settings
 from django.http import HttpResponseRedirect, Http404
-from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.template import RequestContext
+from django.shortcuts import render, get_object_or_404, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 
@@ -98,8 +97,7 @@ def wipe_version(request, project_slug, version_slug):
         for del_dir in del_dirs:
             broadcast(type='build', task=remove_dir, args=[del_dir])
         return redirect('project_version_list', project_slug)
-    return render_to_response('wipe_version.html', {'version': version, 'project': version.project},
-                              context_instance=RequestContext(request))
+    return render(request, 'wipe_version.html', {'version': version, 'project': version.project})
 
 
 def divide_by_zero(request):  # pylint: disable=unused-argument
@@ -108,8 +106,7 @@ def divide_by_zero(request):  # pylint: disable=unused-argument
 
 def server_error_500(request, template_name='500.html'):
     """A simple 500 handler so we get media"""
-    r = render_to_response(template_name,
-                           context_instance=RequestContext(request))
+    r = render(request, template_name)
     r.status_code = 500
     return r
 
@@ -119,7 +116,6 @@ def server_error_404(request, exception, template_name='404.html'):  # pylint: d
     response = get_redirect_response(request, path=request.get_full_path())
     if response:
         return response
-    r = render_to_response(template_name,
-                           context_instance=RequestContext(request))
+    r = render(request, template_name)
     r.status_code = 404
     return r

readthedocs/core/views/serve.py

@@ -27,7 +27,7 @@
 from __future__ import absolute_import
 from django.conf import settings
 from django.http import HttpResponse, HttpResponseRedirect, Http404
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.template import RequestContext
 from django.views.static import serve
 
@@ -109,8 +109,7 @@ def redirect_page_with_filename(request, project, subproject, filename):  # pyli
 
 
 def _serve_401(request, project):
-    res = render_to_response('401.html',
-                             context_instance=RequestContext(request))
+    res = render(request, '401.html')
     res.status_code = 401
     log.error('Unauthorized access to {0} documentation'.format(project.slug))
     return res

readthedocs/gold/views.py

@@ -6,7 +6,7 @@
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages
 from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext_lazy as _
@@ -106,17 +106,13 @@ def projects(request):
     else:
         form = GoldProjectForm()
 
-    return render_to_response(
-        'gold/projects.html',
-        {
-            'form': form,
-            'gold_user': gold_user,
-            'publishable': settings.STRIPE_PUBLISHABLE,
-            'user': request.user,
-            'projects': gold_projects
-        },
-        context_instance=RequestContext(request)
-    )
+    return render(request, 'gold/projects.html', {
+        'form': form,
+        'gold_user': gold_user,
+        'publishable': settings.STRIPE_PUBLISHABLE,
+        'user': request.user,
+        'projects': gold_projects
+    })
 
 
 @login_required

readthedocs/profiles/views.py

@@ -10,8 +10,8 @@
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render, redirect
-from django.shortcuts import render_to_response
+from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import render
 from django.template import RequestContext
 
 from readthedocs.core.forms import UserDeleteForm
@@ -103,9 +103,7 @@ def create_profile(request, form_class, success_url=None,
     for key, value in list(extra_context.items()):
         context[key] = (value() if callable(value) else value)
 
-    return render_to_response(template_name,
-                              {'form': form},
-                              context_instance=context)
+    return render(request, template_name, {'form': form})
 create_profile = login_required(create_profile)
 
 
@@ -180,11 +178,11 @@ def edit_profile(request, form_class, success_url=None,
     for key, value in list(extra_context.items()):
         context[key] = (value() if callable(value) else value)
 
-    return render_to_response(template_name, {
+    return render(request, template_name, {
         'form': form,
         'profile': profile_obj,
         'user': profile_obj.user,
-    }, context_instance=context)
+    })
 edit_profile = login_required(edit_profile)
 
 
@@ -271,6 +269,4 @@ def profile_detail(request, username, public_profile_field=None,
     for key, value in list(extra_context.items()):
         context[key] = (value() if callable(value) else value)
 
-    return render_to_response(template_name,
-                              {'profile': profile_obj},
-                              context_instance=context)
+    return render(request, template_name, {'profile': profile_obj})

readthedocs/projects/forms.py

@@ -292,7 +292,7 @@ def __init__(self, version, attrs=None, check_test=bool):
         super(DualCheckboxWidget, self).__init__(attrs, check_test)
         self.version = version
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         checkbox = super(DualCheckboxWidget, self).render(name, value, attrs)
         icon = self.render_icon()
         return mark_safe('{}{}'.format(checkbox, icon))