Fixed various depreciation warnings with django 1.11

Author: izimobil

admin_tools/dashboard/dashboards.py

@@ -9,7 +9,10 @@
     # Django < 1.9 and Python < 2.7
     from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.utils.encoding import force_text
 
 from admin_tools.dashboard import modules

admin_tools/dashboard/migrations/0001_initial.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('data', models.TextField()),
                 ('dashboard_id', models.CharField(max_length=100)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ('user',),

admin_tools/dashboard/models.py

@@ -16,7 +16,7 @@ class DashboardPreferences(models.Model):
     """
     This model represents the dashboard preferences for a user.
     """
-    user = models.ForeignKey(user_model)
+    user = models.ForeignKey(user_model, on_delete=models.CASCADE)
     data = models.TextField()
     dashboard_id = models.CharField(max_length=100)
 

admin_tools/dashboard/modules.py

@@ -3,7 +3,10 @@
 """
 
 from django.apps import apps as django_apps
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.forms.utils import flatatt
 
 from django.utils.itercompat import is_iterable

admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.txt

@@ -11,7 +11,10 @@ And to activate the app index dashboard::
 """
 
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from admin_tools.dashboard import modules, Dashboard, AppIndexDashboard
 from admin_tools.utils import get_admin_site_name

admin_tools/dashboard/templates/admin_tools/dashboard/dashboard_app_index.txt

@@ -1,5 +1,8 @@
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from admin_tools.dashboard import modules, AppIndexDashboard
 
 # create your custom modules here if you want, for example:

admin_tools/dashboard/templatetags/admin_tools_dashboard_tags.py

@@ -11,7 +11,10 @@
 
 from django import template
 from django.db import IntegrityError
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from admin_tools.utils import get_admin_site_name
 from admin_tools.dashboard.utils import get_dashboard

admin_tools/dashboard/utils.py

@@ -8,7 +8,10 @@
     # Django < 1.9 and Python < 2.7
     from django.utils.importlib import import_module
 from django.utils.text import capfirst
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from admin_tools.dashboard.registry import Registry
 from admin_tools.utils import get_admin_site

admin_tools/menu/items.py

@@ -1,5 +1,8 @@
 from django.apps import apps as django_apps
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from admin_tools.utils import AppListElementMixin

admin_tools/menu/menus.py

@@ -2,7 +2,10 @@
 Module where admin tools menu classes are defined.
 """
 
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from admin_tools.menu import items