Skip to content

Commit

Permalink
Merge pull request #1 from vintasoftware/support-django-2
Browse files Browse the repository at this point in the history
Fix support for Django >= 2.0
  • Loading branch information
fjsj committed Apr 12, 2018
2 parents e752e22 + 37f8fe7 commit 9855d57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion django_markdown/templatetags/django_markdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
import posixpath

from django import template
from django.core.urlresolvers import reverse
try:
from django.core.urlresolvers import reverse
except ImportError: # Django >= 2.0
from django.urls import reverse
from django.utils.safestring import mark_safe

from ..utils import markdown as _markdown, settings, simplejson
Expand Down
5 changes: 4 additions & 1 deletion django_markdown/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
""" Markdown utils. """
import markdown as markdown_module

from django.core.urlresolvers import reverse
try:
from django.core.urlresolvers import reverse
except ImportError: # Django >= 2.0
from django.urls import reverse
from django.template import loader, Context
from django.utils.encoding import force_text
from django.utils.safestring import mark_safe
Expand Down

0 comments on commit 9855d57

Please sign in to comment.