Skip to content

Commit

Permalink
Use explicit arguments in template.render()
Browse files Browse the repository at this point in the history
Django 1.8 deprecates some arguments, adds more.  Django 1.10 removes
some and thus positional arguments will change.  Prevent bugs now.
  • Loading branch information
dwaynebailey committed Nov 16, 2016
1 parent 2d5e2c3 commit 6016090
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions pootle/apps/pootle_store/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def _get_critical_checks_snippet(request, unit):
'unit': unit,
}
template = loader.get_template('editor/units/xhr_checks.html')
return template.render(ctx, request)
return template.render(context=ctx, request=request)


@ajax_required
Expand Down Expand Up @@ -259,7 +259,8 @@ def save_comment(request, unit):
}
t = loader.get_template('editor/units/xhr_comment.html')

return JsonResponse({'comment': t.render(ctx, request)})
return JsonResponse({'comment': t.render(context=ctx,
request=request)})

return JsonResponseBadRequest({'msg': _("Comment submission failed.")})

Expand Down Expand Up @@ -340,7 +341,7 @@ def get_response_data(self, context):
'timeline': self.render_timeline(context)}

def render_timeline(self, context):
return loader.get_template(self.template_name).render(context)
return loader.get_template(self.template_name).render(context=context)

def get_entries_group_data(self, context):
result = []
Expand All @@ -367,7 +368,8 @@ def get_edit_template(self):
return loader.get_template('editor/units/edit.html')

def render_edit_template(self, context):
return self.get_edit_template().render(context, self.request)
return self.get_edit_template().render(context=context,
request=self.request)

def get_source_nplurals(self):
if self.object.hasplural():
Expand Down
2 changes: 1 addition & 1 deletion pootle/apps/staticpages/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def display_page(request, virtual_path):

def _get_rendered_agreement(request, form):
template = get_template('staticpages/agreement.html')
return template.render({'form': form}, request)
return template.render(context={'form': form}, request=request)


@ajax_required
Expand Down
2 changes: 1 addition & 1 deletion tests/core/formtable.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_formtable():
def _render_template(string, context=None):
context = context or {}
context = Context(context)
return Template(string).render(context)
return Template(string).render(context=context)


@pytest.mark.django
Expand Down
2 changes: 1 addition & 1 deletion tests/views/timeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def _calculate_timeline(request, unit):
entries_group.reverse()
context['entries_group'] = entries_group
t = loader.get_template('editor/units/xhr_timeline.html')
return t.render(context, request)
return t.render(context=context, request=request)


def _timeline_test(client, request_user, unit):
Expand Down

0 comments on commit 6016090

Please sign in to comment.