aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/views.py
diff options
context:
space:
mode:
authorTom Christie2011-07-01 17:44:08 +0100
committerTom Christie2011-07-01 17:44:08 +0100
commitf7b7778a79bad4124a6f50bf461f206a6d71fa90 (patch)
tree2bd1b84a90dec5724cda3d89b3a9faf5ca298961 /djangorestframework/views.py
parentc3babe751a6bab7c7888f173b7853a65ba2ea35e (diff)
parentf67c0651baf1cea65221b4fb7f4df11a54abed90 (diff)
downloaddjango-rest-framework-f7b7778a79bad4124a6f50bf461f206a6d71fa90.tar.bz2
pull in markos changes, minor tweaks to yaml stuff
Diffstat (limited to 'djangorestframework/views.py')
-rw-r--r--djangorestframework/views.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/djangorestframework/views.py b/djangorestframework/views.py
index 18d064e1..757d89db 100644
--- a/djangorestframework/views.py
+++ b/djangorestframework/views.py
@@ -44,7 +44,8 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
renderers.DocumentingHTMLRenderer,
renderers.DocumentingXHTMLRenderer,
renderers.DocumentingPlainTextRenderer,
- renderers.XMLRenderer )
+ renderers.XMLRenderer,
+ renderers.YAMLRenderer )
"""
List of parsers the resource can parse the request with.