aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/renderers.py
diff options
context:
space:
mode:
authorTom Christie2012-02-21 22:09:05 +0000
committerTom Christie2012-02-21 22:09:05 +0000
commit9277f438cb85e8205cfe0149142d2f2b4d11a31c (patch)
treeb9d48aff11c89d378f90db6ea06e6c01480dec39 /djangorestframework/renderers.py
parentca9465f11e3310b7b1e18cd893e96b69963f68c9 (diff)
downloaddjango-rest-framework-9277f438cb85e8205cfe0149142d2f2b4d11a31c.tar.bz2
Fix YAML parser bug
Diffstat (limited to 'djangorestframework/renderers.py')
-rw-r--r--djangorestframework/renderers.py35
1 files changed, 17 insertions, 18 deletions
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py
index de9a01ec..71c381f7 100644
--- a/djangorestframework/renderers.py
+++ b/djangorestframework/renderers.py
@@ -152,25 +152,22 @@ class XMLRenderer(BaseRenderer):
return dict2xml(obj)
-if yaml:
- class YAMLRenderer(BaseRenderer):
- """
- Renderer which serializes to YAML.
- """
+class YAMLRenderer(BaseRenderer):
+ """
+ Renderer which serializes to YAML.
+ """
- media_type = 'application/yaml'
- format = 'yaml'
+ media_type = 'application/yaml'
+ format = 'yaml'
- def render(self, obj=None, media_type=None):
- """
- Renders *obj* into serialized YAML.
- """
- if obj is None:
- return ''
+ def render(self, obj=None, media_type=None):
+ """
+ Renders *obj* into serialized YAML.
+ """
+ if obj is None:
+ return ''
- return yaml.safe_dump(obj)
-else:
- YAMLRenderer = None
+ return yaml.safe_dump(obj)
class TemplateRenderer(BaseRenderer):
@@ -409,5 +406,7 @@ DEFAULT_RENDERERS = (
XMLRenderer
)
-if YAMLRenderer:
- DEFAULT_RENDERERS += (YAMLRenderer,)
+if yaml:
+ DEFAULT_RENDERERS += (YAMLRenderer, )
+else:
+ YAMLRenderer = None