From 544b4b9948059882a11c8d99db4466454a37b3c4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 9 Mar 2017 16:50:00 +0000 Subject: [PATCH] Ensure 'markdown' dependancy is optional. Refs #4941. (#4947) --- rest_framework/__init__.py | 2 +- rest_framework/compat.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 8cff96621..52c7cacd4 100644 --- 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 index dbc5731cb..45ac49841 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -249,6 +249,7 @@ try: return md.convert(text) except ImportError: apply_markdown = None + markdown = None try: