Commit fdd7a355 authored by Claude Paroz's avatar Claude Paroz
Browse files

Deprecated django.utils.importlib 

This was a shim for pre-Python 2.7 support.
parent ac095587

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ variable, and then from django.conf.global_settings; see the global settings fil 
a list of all possible variables.

"""



import importlib

import logging

import os

import sys
@@ -15,7 +16,6 @@ import warnings 
from django.conf import global_settings

from django.core.exceptions import ImproperlyConfigured

from django.utils.functional import LazyObject, empty

from django.utils import importlib

from django.utils.module_loading import import_by_path

from django.utils import six

django/conf/urls/__init__.py

+2 −1
Original line number Diff line number Diff line 
from importlib import import_module



from django.core.urlresolvers import (RegexURLPattern,

    RegexURLResolver, LocaleRegexURLResolver)

from django.core.exceptions import ImproperlyConfigured

from django.utils.importlib import import_module

from django.utils import six

django/contrib/admin/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ def autodiscover(): 
    """



    import copy

    from importlib import import_module

    from django.conf import settings

    from django.utils.importlib import import_module

    from django.utils.module_loading import module_has_submodule



    for app in settings.INSTALLED_APPS:

django/contrib/admindocs/views.py

+1 −1
Original line number Diff line number Diff line 
from importlib import import_module

import inspect

import os

import re
@@ -13,7 +14,6 @@ from django.http import Http404 
from django.core import urlresolvers

from django.contrib.admindocs import utils

from django.contrib.sites.models import Site

from django.utils.importlib import import_module

from django.utils._os import upath

from django.utils import six

from django.utils.translation import ugettext as _

django/contrib/auth/hashers.py

+1 −1
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ from __future__ import unicode_literals 
import base64

import binascii

import hashlib

import importlib



from django.dispatch import receiver

from django.conf import settings

from django.test.signals import setting_changed

from django.utils import importlib

from django.utils.datastructures import SortedDict

from django.utils.encoding import force_bytes, force_str, force_text

from django.core.exceptions import ImproperlyConfigured