From 4ff3d2709a01b00d28a37e361c5559a17c522875 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 26 May 2015 23:42:37 +0200 Subject: [PATCH] clear deprecation warning about django.utils.importlib by using importlib from Python 2.7 --- admin_tools/dashboard/dashboards.py | 6 +++++- admin_tools/dashboard/registry.py | 6 +++++- admin_tools/dashboard/utils.py | 6 +++++- admin_tools/menu/utils.py | 6 +++++- admin_tools/utils.py | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/admin_tools/dashboard/dashboards.py b/admin_tools/dashboard/dashboards.py index e2f8922..2c1a72d 100644 --- a/admin_tools/dashboard/dashboards.py +++ b/admin_tools/dashboard/dashboards.py @@ -3,7 +3,11 @@ Module where admin tools dashboard classes are defined. """ from django.template.defaultfilters import slugify -from django.utils.importlib import import_module +try: + from importlib import import_module +except ImportError: + # 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 from django.contrib.contenttypes.models import ContentType diff --git a/admin_tools/dashboard/registry.py b/admin_tools/dashboard/registry.py index e117352..a5eb766 100644 --- a/admin_tools/dashboard/registry.py +++ b/admin_tools/dashboard/registry.py @@ -32,7 +32,11 @@ def autodiscover(blacklist=[]): """ import imp from django.conf import settings - from django.utils.importlib import import_module + try: + from importlib import import_module + except ImportError: + # Django < 1.9 and Python < 2.7 + from django.utils.importlib import import_module blacklist.append('admin_tools.dashboard') blacklist.append('admin_tools.menu') diff --git a/admin_tools/dashboard/utils.py b/admin_tools/dashboard/utils.py index e6c8574..a67d3ab 100644 --- a/admin_tools/dashboard/utils.py +++ b/admin_tools/dashboard/utils.py @@ -2,7 +2,11 @@ Dashboard utilities. """ from django.conf import settings -from django.utils.importlib import import_module +try: + from importlib import import_module +except ImportError: + # 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 diff --git a/admin_tools/menu/utils.py b/admin_tools/menu/utils.py index 1b3569c..723a67f 100644 --- a/admin_tools/menu/utils.py +++ b/admin_tools/menu/utils.py @@ -3,7 +3,11 @@ Menu utilities. """ from django.conf import settings -from django.utils.importlib import import_module +try: + from importlib import import_module +except ImportError: + # Django < 1.9 and Python < 2.7 + from django.utils.importlib import import_module from django.core.urlresolvers import reverse diff --git a/admin_tools/utils.py b/admin_tools/utils.py index 2af2c6c..676b4ea 100644 --- a/admin_tools/utils.py +++ b/admin_tools/utils.py @@ -6,7 +6,11 @@ from fnmatch import fnmatch from django.conf import settings from django.contrib import admin from django.core.urlresolvers import reverse -from django.utils.importlib import import_module +try: + from importlib import import_module +except ImportError: + # Django < 1.9 and Python < 2.7 + from django.utils.importlib import import_module import warnings def uniquify(value, seen_values):