Ensure 'markdown' dependancy is optional. Refs #4941. (#4947)

encode · Mar 9, 2017 · 544b4b9 · 544b4b9
1 parent b884bdd
commit 544b4b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
@@ -8,7 +8,7 @@
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.6.0'
+__version__ = '3.6.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2017 Tom Christie'

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -249,6 +249,7 @@ def apply_markdown(text):
         return md.convert(text)
 except ImportError:
     apply_markdown = None
+    markdown = None
 
 
 try: