Django 2.0 support

Author: vdboor

fluent_dashboard/items.py

@@ -4,14 +4,18 @@
 import django
 from admin_tools.menu import items
 from django.contrib.contenttypes.models import ContentType
-from django.core import urlresolvers
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.defaultfilters import capfirst
 from django.utils.translation import ugettext as _
 from fluent_dashboard.appgroups import sort_cms_models
 from fluent_dashboard.compat import get_meta_model_name
 import re
 
+try:
+    from django import urls  # Django 1.10+
+except ImportError:
+    from django.core import urlresolvers as urls
+
 RE_CHANGE_URL = re.compile("(.+)_([^_]+)_change")
 
 
@@ -89,7 +93,7 @@ def init_with_context(self, context):
         if edited_model:
             try:
                 url = edited_model.get_absolute_url()
-            except (AttributeError, urlresolvers.NoReverseMatch) as e:
+            except (AttributeError, urls.NoReverseMatch) as e:
                 pass
             else:
                 if url:
@@ -100,7 +104,7 @@ def get_edited_object(self, request):
         Return the object which is currently being edited.
         Returns ``None`` if the match could not be made.
         """
-        resolvermatch = urlresolvers.resolve(request.path_info)
+        resolvermatch = urls.resolve(request.path_info)
         if resolvermatch.namespace == 'admin' and resolvermatch.url_name and resolvermatch.url_name.endswith('_change'):
             # In "appname_modelname_change" view of the admin.
             # Extract the appname and model from the url name.
@@ -109,7 +113,12 @@ def get_edited_object(self, request):
             if not match:
                 return None
 
-            object_id = resolvermatch.args[0]  # Can be string (e.g. a country code as PK).
+            # object_id can be string (e.g. a country code as PK).
+            try:
+                object_id = resolvermatch.kwargs['object_id']  # Django 2.0+
+            except KeyError:
+                object_id = resolvermatch.args[0]
+
             return self.get_object_by_natural_key(match.group(1), match.group(2), object_id)
         return None
 

fluent_dashboard/menu.py

@@ -1,13 +1,17 @@
 """
 Custom menu for fluent_dashboard apps.
 """
-from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from admin_tools.menu import items, Menu
 from admin_tools.utils import get_admin_site_name
 from fluent_dashboard.items import CmsModelList, ReturnToSiteItem
 from fluent_dashboard.appgroups import get_application_groups
 
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
+
 
 class FluentMenu(Menu):
     """

fluent_dashboard/modules.py

@@ -13,7 +13,6 @@
 import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, NoReverseMatch
 from django.utils.translation import ugettext as _
 from admin_tools.utils import get_admin_site_name
 from admin_tools.dashboard import modules
@@ -27,6 +26,11 @@
 except ImportError:
     from django.db.models.loading import get_model
 
+try:
+    from django.urls import reverse, NoReverseMatch  # Django 1.10+
+except ImportError:
+    from django.core.urlresolvers import reverse, NoReverseMatch
+
 logger = logging.getLogger("fluent_dashboard.modules")
 
 

setup.py

@@ -39,7 +39,7 @@ def find_version(*parts):
     license='Apache 2.0',
 
     install_requires=[
-        'django-admin-tools>=0.5.2',  # 0.5.2 has proper Django 1.5/1.6 support.
+        'django-admin-tools>=0.5.2',
         'future>=0.12.2',
     ],
     requires=[