mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-08-09 23:04:47 +03:00
Version 3.4.3
This commit is contained in:
parent
35320b1f2d
commit
10a9a6744f
|
@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`:
|
|||
|
||||
## 3.4.x series
|
||||
|
||||
### 3.4.3
|
||||
|
||||
**Date**: [5th August 2016][3.4.3-milestone]
|
||||
|
||||
* Include fallaback for users of older TemplateHTMLRenderer internal API.
|
||||
|
||||
### 3.4.2
|
||||
|
||||
**Date**: [5th August 2016][3.4.2-milestone]
|
||||
|
|
|
@ -8,7 +8,7 @@ ______ _____ _____ _____ __
|
|||
"""
|
||||
|
||||
__title__ = 'Django REST framework'
|
||||
__version__ = '3.4.2'
|
||||
__version__ = '3.4.3'
|
||||
__author__ = 'Tom Christie'
|
||||
__license__ = 'BSD 2-Clause'
|
||||
__copyright__ = 'Copyright 2011-2016 Tom Christie'
|
||||
|
|
|
@ -166,7 +166,11 @@ class TemplateHTMLRenderer(BaseRenderer):
|
|||
template_names = self.get_template_names(response, view)
|
||||
template = self.resolve_template(template_names)
|
||||
|
||||
context = self.get_template_context(data, renderer_context)
|
||||
if hasattr(self, 'resolve_context'):
|
||||
# Fallback for older versions.
|
||||
context = self.resolve_context(self, data, request, response)
|
||||
else:
|
||||
context = self.get_template_context(data, renderer_context)
|
||||
return template_render(template, context, request=request)
|
||||
|
||||
def resolve_template(self, template_names):
|
||||
|
@ -229,7 +233,10 @@ class StaticHTMLRenderer(TemplateHTMLRenderer):
|
|||
if response and response.exception:
|
||||
request = renderer_context['request']
|
||||
template = self.get_exception_template(response)
|
||||
context = self.resolve_context(data, request, response)
|
||||
if hasattr(self, 'resolve_context'):
|
||||
context = self.resolve_context(data, request, response)
|
||||
else:
|
||||
context = self.get_template_context(data, renderer_context)
|
||||
return template_render(template, context, request=request)
|
||||
|
||||
return data
|
||||
|
|
Loading…
Reference in New Issue
Block a user