summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/flush.py1
-rw-r--r--django/core/management/commands/migrate.py2
-rw-r--r--django/db/migrations/loader.py2
-rw-r--r--django/db/migrations/writer.py2
4 files changed, 3 insertions, 4 deletions
diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
index 5e951f97b4..ea0952cb53 100644
--- a/django/core/management/commands/flush.py
+++ b/django/core/management/commands/flush.py
@@ -8,7 +8,6 @@ from django.core.management import call_command
from django.core.management.base import NoArgsCommand, CommandError
from django.core.management.color import no_style
from django.core.management.sql import sql_flush, emit_post_migrate_signal
-from django.utils.importlib import import_module
from django.utils.six.moves import input
from django.utils import six
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index 085b6b2cc7..dbec389bed 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -1,5 +1,6 @@
from optparse import make_option
from collections import OrderedDict
+from importlib import import_module
import itertools
import traceback
@@ -11,7 +12,6 @@ from django.core.management.sql import custom_sql_for_model, emit_post_migrate_s
from django.db import connections, router, transaction, models, DEFAULT_DB_ALIAS
from django.db.migrations.executor import MigrationExecutor
from django.db.migrations.loader import AmbiguityError
-from django.utils.importlib import import_module
from django.utils.module_loading import module_has_submodule
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
index 441480b194..6ad6959787 100644
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -1,5 +1,5 @@
import os
-from django.utils.importlib import import_module
+from importlib import import_module
from django.utils.functional import cached_property
from django.db.models.loading import cache
from django.db.migrations.recorder import MigrationRecorder
diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py
index 4cc84dcca7..753aeacd04 100644
--- a/django/db/migrations/writer.py
+++ b/django/db/migrations/writer.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
import datetime
import types
import os
+from importlib import import_module
from django.utils import six
-from django.utils.importlib import import_module
from django.db import models
from django.db.models.loading import cache
from django.db.migrations.loader import MigrationLoader