diff --git a/django_markdown/templatetags/django_markdown.py b/django_markdown/templatetags/django_markdown.py index 4199a13..1a4a4a9 100644 --- a/django_markdown/templatetags/django_markdown.py +++ b/django_markdown/templatetags/django_markdown.py @@ -2,7 +2,11 @@ import posixpath from django import template -from django.core.urlresolvers import reverse + +try: # django <= 1.6 + from django.core.urlresolvers import reverse +except ImportError: # from django 1.7 to django 2.0 (and more) + from django.urls import reverse from ..utils import markdown as _markdown, settings, simplejson, mark_safe diff --git a/django_markdown/utils.py b/django_markdown/utils.py index c7777e5..d6f5848 100644 --- a/django_markdown/utils.py +++ b/django_markdown/utils.py @@ -1,5 +1,9 @@ """ Markdown utils. """ -from django.core.urlresolvers import reverse +try: # django <= 1.6 + from django.core.urlresolvers import reverse +except ImportError: # from django 1.7 to django 2.0 (and more) + from django.urls import reverse + import markdown as markdown_module from django.utils.encoding import force_text from django.utils.safestring import mark_safe