Merge pull request #1574 from rtfd/fix-18-template-context

Just straight dicts, not Context’s for django Templates

Author: ericholscher

readthedocs/core/management/commands/archive.py

@@ -1,11 +1,10 @@
 from glob import glob
 import os
 import logging
-from optparse import make_option
 
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.template import Context, loader as template_loader
+from django.template import loader as template_loader
 
 log = logging.getLogger(__name__)
 
@@ -26,9 +25,9 @@ def handle(self, *args, **options):
                 v = version.replace(path + '/', '')
                 doc_index[directory].append(v)
 
-        context = Context({
+        context = {
             'doc_index': doc_index,
             'MEDIA_URL': settings.MEDIA_URL,
-        })
+        }
         html = template_loader.get_template('archive/index.html').render(context)
         print html

readthedocs/core/utils/__init__.py

@@ -7,7 +7,6 @@
 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import get_template
-from django.template import Context
 
 from readthedocs.builds.constants import LATEST
 from readthedocs.builds.constants import LATEST_VERBOSE_NAME
@@ -112,7 +111,8 @@ def send_email(recipient, subject, template, template_html, context=None,
         scheme = 'https' if request.is_secure() else 'http'
         context['uri'] = '{scheme}://{host}'.format(scheme=scheme,
                                                     host=request.get_host())
-    ctx = Context(context)
+    ctx = {}
+    ctx.update(context)
     msg = EmailMultiAlternatives(
         subject,
         get_template(template).render(ctx),

readthedocs/doc_builder/backends/mkdocs.py

@@ -109,13 +109,13 @@ def append_conf(self, **kwargs):
             'commit': self.version.project.vcs_repo(self.version.slug).commit,
         }
         data_json = json.dumps(readthedocs_data, indent=4)
-        data_ctx = Context({
+        data_ctx = {
             'data_json': data_json,
             'current_version': readthedocs_data['version'],
             'slug': readthedocs_data['project'],
             'html_theme': readthedocs_data['theme'],
             'pagename': None,
-        })
+        }
         data_string = template_loader.get_template(
             'doc_builder/data.js.tmpl'
         ).render(data_ctx)
@@ -125,10 +125,10 @@ def append_conf(self, **kwargs):
         data_file.write('\nREADTHEDOCS_DATA["page"] = mkdocs_page_name')
         data_file.close()
 
-        include_ctx = Context({
+        include_ctx = {
             'global_analytics_code': getattr(settings, 'GLOBAL_ANALYTICS_CODE', 'UA-17997319-1'),
             'user_analytics_code': self.version.project.analytics_code,
-        })
+        }
         include_string = template_loader.get_template(
             'doc_builder/include.js.tmpl'
         ).render(include_ctx)

readthedocs/doc_builder/backends/sphinx.py

@@ -6,7 +6,7 @@
 import logging
 import zipfile
 
-from django.template import Context, loader as template_loader
+from django.template import loader as template_loader
 from django.template.loader import render_to_string
 from django.conf import settings
 
@@ -88,7 +88,7 @@ def append_conf(self, **kwargs):
         bitbucket_version_is_editable = (self.version.type == 'branch')
         display_bitbucket = bitbucket_user is not None
 
-        rtd_ctx = Context({
+        rtd_ctx = {
             'current_version': self.version.verbose_name,
             'project': project,
             'settings': settings,
@@ -109,7 +109,7 @@ def append_conf(self, **kwargs):
             'bitbucket_version_is_editable': bitbucket_version_is_editable,
             'display_bitbucket': display_bitbucket,
             'commit': self.project.vcs_repo(self.version.slug).commit,
-        })
+        }
 
         # Avoid hitting database and API if using Docker build environment
         if getattr(settings, 'DONT_HIT_API', False):

readthedocs/restapi/views/footer_views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import get_object_or_404
-from django.template import Context, loader as template_loader
+from django.template import loader as template_loader
 from django.conf import settings
 from django.core.context_processors import csrf
 
@@ -101,7 +101,7 @@ def footer_html(request):
 
     version_compare_data = get_version_compare_data(project, version)
 
-    context = Context({
+    context = {
         'project': project,
         'path': path,
         'downloads': version.get_downloads(pretty=True),
@@ -118,7 +118,7 @@ def footer_html(request):
         'github_edit_url': version.get_github_url(docroot, page_slug, source_suffix, 'edit'),
         'github_view_url': version.get_github_url(docroot, page_slug, source_suffix, 'view'),
         'bitbucket_url': version.get_bitbucket_url(docroot, page_slug, source_suffix),
-    })
+    }
 
     context.update(csrf(request))
     html = template_loader.get_template('restapi/footer.html').render(context)