Merge pull request #12 from tboulogne/master

django.core.urlresolvers removed in Django 2

Author: synw

instant/urls.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from django.core.urlresolvers import reverse_lazy
+from django import VERSION
+if VERSION >= (2, 0):
+    from django.urls import reverse_lazy
+else:
+    from django.core.urlresolvers import reverse_lazy
 from django.conf.urls import url
 from django.views.generic import RedirectView
 from instant.views import FrontendView, StaffChannelView, PostMsgView

instant/views.py

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 import json
+from django import VERSION
+
 from django.http import JsonResponse
-from django.core.urlresolvers import reverse
+if VERSION >= (2, 0):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 from django.http.response import Http404
 from django.views.generic.base import View
 from django.views.generic import FormView