import NoReverseMatch, reverse in django2

AUTHORS.rst

@@ -7,6 +7,7 @@ Ivan Ven Osdel <[email protected]>
 James Turk <[email protected]>
 Jannis Leidel <[email protected]>
 Jeremy Carbaugh
+Kyrylo Havrylenko <[email protected]>
 Mike Korobov <[email protected]>
 Mikhael Korneev
 Neil Muller

CHANGES.rst

@@ -4,7 +4,7 @@ CHANGES
 master (unreleased)
 -------------------
 
-* none yet
+* Add compatibility with Django == 2.0.
 
 3.0.0 (2016.09.04)
 ------------------

markitup/templatetags/markitup_tags.py

@@ -1,11 +1,15 @@
 from __future__ import unicode_literals
 
 from django import template
-from django.core.urlresolvers import reverse, NoReverseMatch
 from markitup import settings
 from markitup.util import absolute_url
 from markitup.fields import render_func
 
+try:
+    from django.core.urlresolvers import NoReverseMatch, reverse
+except ImportError:
+    from django.urls import NoReverseMatch, reverse
+
 register = template.Library()
 
 

markitup/widgets.py

@@ -3,12 +3,15 @@
 import posixpath
 from django import forms
 from django.contrib.admin.widgets import AdminTextareaWidget
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from markitup import settings
 from markitup.util import absolute_url
 
+try:
+    from django.core.urlresolvers import NoReverseMatch, reverse
+except ImportError:
+    from django.urls import NoReverseMatch, reverse
 
 class MarkupInput(forms.Widget):
     def render(self, name, value, attrs=None):

tox.ini

@@ -2,7 +2,8 @@
 envlist=
   py27-1.{8,9,10},
   py34-1.{8,9,10},
-  py35-1.{9,10}
+  py35-1.{9,10,11},
+  py35-2.{0}
 
 [testenv]
 basepython =
@@ -14,3 +15,4 @@ deps =
   1.8: Django>=1.8,<1.9
   1.9: Django>=1.9,<1.10
   1.10: Django>=1.10,<1.11
+  2.0: Django==2.0