Merge pull request klen#7 from SoftwareMaven/django_1.5

Update to support Django 1.5.
gaqzi · Dec 14, 2012 · 1129dc0 · 1129dc0
2 parents e186db7 + b639fb7
commit 1129dc0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/django_markdown/templates/django_markdown/preview.html b/django_markdown/templates/django_markdown/preview.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="{% firstof STATIC_URL MEDIA_URL %}django_markdown/preview.css" />
 </head>
 <body>
-{{ params.content|markdown }}
+{{ content|markdown }}
 </body>
 </html>
 
diff --git a/django_markdown/urls.py b/django_markdown/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import patterns, url
 
 from django_markdown.views import preview
 

diff --git a/django_markdown/views.py b/django_markdown/views.py
@@ -1,7 +1,7 @@
-from django.views.generic.simple import direct_to_template
+from django.shortcuts import render
 
 
 def preview(request):
-    return direct_to_template(
+    return render(
             request, 'django_markdown/preview.html',
             content=request.REQUEST.get('data', 'No content posted'))