encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 22:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge cd8372960d into a07212389d

Browse Source
This commit is contained in:
GitHub Merge Button 2012-04-11 14:16:27 -07:00
commit 261a9e1ecb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
djangorestframework/compat.py
View File

@ -421,7 +421,7 @@ try:
md = markdown.Markdown(extensions=extensions, safe_mode=safe_mode) md = markdown.Markdown(extensions=extensions, safe_mode=safe_mode)
return md.convert(text) return md.convert(text)
except ImportError: except (ImportError, AttributeError):
apply_markdown = None apply_markdown = None
# Yaml is optional # Yaml is optional