aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2014-11-20 14:32:37 +0000
committerTom Christie2014-11-20 14:32:37 +0000
commitd037c53b57cc4777ab6ccf94a241eca0cffa2a36 (patch)
treec27ac314876f7184f7f6bd7bd4776150572ae16d /rest_framework
parent6ec96d0bac1e738aceec9f8c21282c172120c7ac (diff)
parent1aa58d16be0e96c7337b1d6bef928c9542c72741 (diff)
downloaddjango-rest-framework-d037c53b57cc4777ab6ccf94a241eca0cffa2a36.tar.bz2
Merge pull request #2095 from tomchristie/3.0-beta
3.0 beta
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/renderers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 8717137a..a9885d3e 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -562,7 +562,7 @@ class BrowsableAPIRenderer(BaseRenderer):
serializer.data,
self.accepted_media_type,
dict(
- self.renderer_context.items() +
+ list(self.renderer_context.items()) +
[('template', 'rest_framework/api_form.html')]
)
)