diff options
Diffstat (limited to 'django/db/backends/base')
| -rw-r--r-- | django/db/backends/base/base.py | 7 | ||||
| -rw-r--r-- | django/db/backends/base/creation.py | 1 | ||||
| -rw-r--r-- | django/db/backends/base/introspection.py | 1 | ||||
| -rw-r--r-- | django/db/backends/base/operations.py | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py index cbc4983046..460fceab71 100644 --- a/django/db/backends/base/base.py +++ b/django/db/backends/base/base.py @@ -1,18 +1,17 @@ -from collections import deque -from contextlib import contextmanager import time import warnings +from collections import deque +from contextlib import contextmanager from django.conf import settings from django.db import DEFAULT_DB_ALIAS -from django.db.backends.signals import connection_created from django.db.backends import utils +from django.db.backends.signals import connection_created from django.db.transaction import TransactionManagementError from django.db.utils import DatabaseError, DatabaseErrorWrapper from django.utils.functional import cached_property from django.utils.six.moves import _thread as thread - NO_DB_ALIAS = '__no_db__' diff --git a/django/db/backends/base/creation.py b/django/db/backends/base/creation.py index 30e094cfe7..854e17b6c2 100644 --- a/django/db/backends/base/creation.py +++ b/django/db/backends/base/creation.py @@ -8,7 +8,6 @@ from django.db import router from django.utils.six import StringIO from django.utils.six.moves import input - # The prefix to put on the default database name when creating # the test database. TEST_DATABASE_PREFIX = 'test_' diff --git a/django/db/backends/base/introspection.py b/django/db/backends/base/introspection.py index d20bfa1df0..5f828b94cc 100644 --- a/django/db/backends/base/introspection.py +++ b/django/db/backends/base/introspection.py @@ -2,7 +2,6 @@ from collections import namedtuple from django.utils import six - # Structure returned by DatabaseIntrospection.get_table_list() TableInfo = namedtuple('TableInfo', ['name', 'type']) diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py index 50f6c93a07..aebe4312c8 100644 --- a/django/db/backends/base/operations.py +++ b/django/db/backends/base/operations.py @@ -1,7 +1,7 @@ import datetime import decimal -from importlib import import_module import warnings +from importlib import import_module from django.conf import settings from django.core.exceptions import ImproperlyConfigured |
