Merged in bdauvergne/django-admin-tools (pull request #39)
clear deprecation warning about django.utils.importlib by using importlib from Python 2.7
This commit is contained in:
commit
e66125a7cd
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue