From f601526ef1eb0bb7917b6856a6a0fba5d2ba3b37 Mon Sep 17 00:00:00 2001
From: Dmitry <zdimon77@gmail.com>
Date: Wed, 4 Jan 2017 15:11:15 +0200
Subject: [PATCH 1/2] Update urls.py

fix for django 1.10
---
 django_markdown/urls.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/django_markdown/urls.py b/django_markdown/urls.py
index ca80d4b..f942283 100644
--- a/django_markdown/urls.py
+++ b/django_markdown/urls.py
@@ -1,8 +1,9 @@
 """ Define preview URL. """
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import preview
 
-urlpatterns = patterns(
-    '', url('preview/$', preview, name='django_markdown_preview'))
+urlpatterns = [
+    url('preview/$', preview, name='django_markdown_preview')
+]

From e39ac6f38ade9d395cc4f730ab6e1754f31b85e2 Mon Sep 17 00:00:00 2001
From: Dmitry <zdimon77@gmail.com>
Date: Wed, 4 Jan 2017 15:26:39 +0200
Subject: [PATCH 2/2] Update editor_init.html

add safe
---
 django_markdown/templates/django_markdown/editor_init.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_markdown/templates/django_markdown/editor_init.html b/django_markdown/templates/django_markdown/editor_init.html
index 5c8ff7a..dfcd6e3 100644
--- a/django_markdown/templates/django_markdown/editor_init.html
+++ b/django_markdown/templates/django_markdown/editor_init.html
@@ -4,7 +4,7 @@
         $("{{ selector }}").each(function (k, el) {
             var el = $(el);
             if(!el.hasClass("markItUpEditor")) el.markItUp(
-                mySettings, {{ extra_settings|default:"{}" }});
+                mySettings, {{ extra_settings|default:"{}"|safe }});
         });
     });
 })(jQuery);