Django 3.0 support

notify/models.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.db.models import QuerySet
 from jsonfield.fields import JSONField
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 from django.utils.html import escape
 from django.utils.timesince import timesince
 from django.utils.translation import ugettext_lazy as _

notify/urls.py

@@ -1,19 +1,21 @@
 try:
-    from django.conf.urls import url
+    from django.conf.urls import path
 except ImportError:
-    from django.urls import url
+    from django.urls import path
 
 from notify import views as nf
 
 app_name = 'notifications'
 
 
 urlpatterns = [
-    url(r'^all/$', nf.notifications, name="all"),
-    url(r'^api/update/$', nf.notification_update, name="update"),
-    url(r'^mark/$', nf.mark, name='mark'),
-    url(r'^mark-all/$', nf.mark_all, name='mark_all'),
-    url(r'^delete/$', nf.delete, name='delete'),
-    url(r'^rdr/(?P<notification_id>[\d]+)/$', nf.read_and_redirect,
+    path('all/', nf.notifications, name="all"),
+    path('api/update/', nf.notification_update, name="update"),
+    path('mark/', nf.mark, name='mark'),
+    path('mark-all/', nf.mark_all, name='mark_all'),
+    path('delete/<int:notification_id>/', nf.delete, name='delete'),
+    path('delete/', nf.delete, name='delete'),
+    path('rdr/<int:notification_id>/', nf.read_and_redirect,
         name='read_and_redirect'),
 ]
+