From 303aa09174fae6d231b94483a4c8077d16dc0a6f Mon Sep 17 00:00:00 2001
From: Nick Hurst <nickthurst@gmail.com>
Date: Fri, 5 Feb 2016 16:02:13 -0500
Subject: [PATCH 1/4] added checks for request.POST for django 1.9 from
 https://github.com/klen/django_markdown/pull/60

---
 django_markdown/utils.py | 5 ++---
 django_markdown/views.py | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/django_markdown/utils.py b/django_markdown/utils.py
index c7777e5..1796d61 100644
--- a/django_markdown/utils.py
+++ b/django_markdown/utils.py
@@ -41,7 +41,6 @@ def editor_js_initialization(selector, **extra_settings):
         previewParserPath=reverse('django_markdown_preview'),
         **settings.MARKDOWN_EDITOR_SETTINGS)
     options.update(extra_settings)
-    ctx = Context(dict(
-        selector=selector, extra_settings=simplejson.dumps(options)),
-        autoescape=False)
+    ctx = dict(selector=selector,
+               extra_settings=mark_safe(simplejson.dumps(options)))
     return INIT_TEMPLATE.render(ctx)
diff --git a/django_markdown/views.py b/django_markdown/views.py
index dbf352f..645d77e 100644
--- a/django_markdown/views.py
+++ b/django_markdown/views.py
@@ -17,8 +17,14 @@ def preview(request):
             from django.contrib.auth.views import redirect_to_login
             return redirect_to_login(request.get_full_path())
 
+    # https://github.com/klen/django_markdown/pull/60
+    if request.POST:
+        content = request.POST.get('data', 'No content posted.')
+    else:
+        content = request.REQUEST.get('data', 'No content posted.')
+
     return render(
         request, settings.MARKDOWN_PREVIEW_TEMPLATE, dict(
-            content=request.REQUEST.get('data', 'No content posted'),
+            content=content,
             css=settings.MARKDOWN_STYLE
         ))

From 458b86bed1fa58f70cb437dc9f7ff2910d65066f Mon Sep 17 00:00:00 2001
From: Nick Hurst <nickthurst@gmail.com>
Date: Fri, 5 Feb 2016 16:02:54 -0500
Subject: [PATCH 2/4] updated urls.py to stop using patterns (deprecated since
 django 1.8), utils.py ctx is passed a dict instead of Context object
 (depreacted)

---
 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..c16792d 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(r'^preview/$', preview, name='django_markdown_preview')
+]

From dd4a36aa3fd9f3ed8a7e6dc21de733c9f601b860 Mon Sep 17 00:00:00 2001
From: Nick Hurst <nickthurst@gmail.com>
Date: Fri, 5 Feb 2016 16:06:25 -0500
Subject: [PATCH 3/4] deleted unneccessary Context import in utils.py

---
 django_markdown/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_markdown/utils.py b/django_markdown/utils.py
index 1796d61..d2357d3 100644
--- a/django_markdown/utils.py
+++ b/django_markdown/utils.py
@@ -3,7 +3,7 @@
 import markdown as markdown_module
 from django.utils.encoding import force_text
 from django.utils.safestring import mark_safe
-from django.template import loader, Context
+from django.template import loader
 
 try:
     import json as simplejson

From f2aaa301ef9778cc5e2e9e46f3e69537e4ed798d Mon Sep 17 00:00:00 2001
From: Nick Hurst <nickthurst@gmail.com>
Date: Fri, 5 Feb 2016 16:35:30 -0500
Subject: [PATCH 4/4] fixed travis ci issues
 https://github.com/klen/django_markdown/pull/56

---
 .coveragerc |  3 ---
 .travis.yml | 13 ++++---------
 tox.ini     | 14 ++++----------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index d80d81c..909a803 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,2 @@
-[report]
-source=django_markdown
-
 [run]
 source=django_markdown
diff --git a/.travis.yml b/.travis.yml
index 53b1684..11f4dde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,13 @@ language: python
 
 python:
 - "2.7"
+- "3.4"
 
 env:
-- TOXENV=py27-d16
-- TOXENV=py27-d17
-- TOXENV=py34-d17
+- TOXENV=d16
+- TOXENV=d17
 - TOXENV=cov
 
-branches:
-    only:
-    - master
-    - develop
-
 install: pip install --quiet --use-mirrors tox
 
 script: tox
@@ -22,4 +17,4 @@ after_script:
 - if [ $TOXENV == "cov" ]; then
     pip install --quiet --use-mirrors coveralls;
     coveralls;
-  fi
+  fi
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index b0df3bd..9ca0187 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py27-d16,py27-d17,py34-d17,cov
+envlist=d16,d17,cov
 
 [pylama]
 skip=example/*
@@ -26,24 +26,18 @@ commands=py.test
 deps =
     pytest
 
-[testenv:py27-d16]
+[testenv:d16]
 basepython = python2.7
 deps =
     django==1.6.7
     {[testenv]deps}
 
-[testenv:py27-d17]
+[testenv:d17]
 basepython = python2.7
 deps =
     django==1.7
     {[testenv]deps}
 
-[testenv:py34-d17]
-basepython = python3.4
-deps =
-    django==1.7
-    {[testenv]deps}
-
 [testenv:cov]
 deps =
     coverage
@@ -52,4 +46,4 @@ deps =
 
 commands =
     coverage run -m py.test
-    coverage report
+    coverage report
\ No newline at end of file