Replace Context by dict

Since Django 1.10 template objects returned by get_template() and
select_template() no longer accept a Context in their render() method.

orchestra/admin/forms.py

@@ -5,7 +5,7 @@ from django import forms
 from django.contrib.admin import helpers
 from django.core import validators
 from django.forms.models import modelformset_factory, BaseModelFormSet
-from django.template import Template, Context
+from django.template import Template
 from django.utils.translation import ugettext_lazy as _
 
 from orchestra.forms.widgets import SpanWidget
@@ -28,9 +28,9 @@ class AdminFormMixin(object):
             '   {% include "admin/includes/fieldset.html" %}'
             '{% endfor %}'
         )
-        context = Context({
+        context = {
             'adminform': adminform
-        })
+        }
         return template.render(context)
 
 
@@ -71,9 +71,9 @@ class AdminFormSet(BaseModelFormSet):
         </div>
         </div>""")
         )
-        context = Context({
+        context = {
             'formset': self
-        })
+        }
         return template.render(context)
 
 

orchestra/contrib/bills/models.py

@@ -6,7 +6,7 @@ from django.core.validators import ValidationError, RegexValidator
 from django.db import models
 from django.db.models import F, Sum
 from django.db.models.functions import Coalesce
-from django.template import loader, Context
+from django.template import loader
 from django.utils import timezone, translation
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
@@ -303,7 +303,7 @@ class Bill(models.Model):
         with translation.override(language or self.account.language):
             if payment is False:
                 payment = self.account.paymentsources.get_default()
-            context = Context({
+            context = {
                 'bill': self,
                 'lines': self.lines.all().prefetch_related('sublines'),
                 'seller': self.seller,
@@ -318,7 +318,7 @@ class Bill(models.Model):
                 'payment': payment and payment.get_bill_context(),
                 'default_due_date': self.get_due_date(payment=payment),
                 'now': timezone.now(),
-            })
+            }
             template_name = 'BILLS_%s_TEMPLATE' % self.get_type()
             template = getattr(settings, template_name, settings.BILLS_DEFAULT_TEMPLATE)
             bill_template = loader.get_template(template)

orchestra/contrib/webapps/backends/php.py

@@ -2,7 +2,7 @@ import os
 import textwrap
 from collections import OrderedDict
 
-from django.template import Template, Context
+from django.template import Template
 from django.utils.translation import ugettext_lazy as _
 
 from orchestra.contrib.orchestration import ServiceController
@@ -245,7 +245,7 @@ class PHPController(WebAppServiceMixin, ServiceController):
             php_admin_value[{{ name | safe }}] = {{ value | safe }}{% endfor %}
             """
         ))
-        return fpm_config.render(Context(context))
+        return fpm_config.render(context)
 
     def get_fcgid_wrapper(self, webapp, context):
         opt = webapp.type_instance

orchestra/contrib/websites/backends/apache.py

@@ -2,7 +2,7 @@ import os
 import re
 import textwrap
 
-from django.template import Template, Context
+from django.template import Template
 from django.utils.translation import ugettext_lazy as _
 
 from orchestra.contrib.orchestration import ServiceController
@@ -78,7 +78,7 @@ class Apache2Controller(ServiceController):
                 {{ line | safe }}{% endfor %}
             </VirtualHost>
             """)
-        ).render(Context(context))
+        ).render(context)
 
     def render_redirect_https(self, context):
         context['port'] = self.HTTP_PORT
@@ -96,7 +96,7 @@ class Apache2Controller(ServiceController):
                 RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
             </VirtualHost>
             """)
-        ).render(Context(context))
+        ).render(context)
 
     def save(self, site):
         context = self.get_context(site)

orchestra/utils/mail.py

@@ -2,7 +2,6 @@ from urllib.parse import urlparse
 
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
-from django.template import Context
 
 
 def render_email_template(template, context):