summaryrefslogtreecommitdiff
path: root/django/db/backends/base
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-09 13:19:34 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 14:24:06 -0500
commita8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch)
tree94ef5bc53e59131906aecfcf792eeac86242aa62 /django/db/backends/base
parenteb406aa686ff1809903366ef6896037af2f1f69b (diff)
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/db/backends/base')
-rw-r--r--django/db/backends/base/base.py7
-rw-r--r--django/db/backends/base/creation.py1
-rw-r--r--django/db/backends/base/introspection.py1
-rw-r--r--django/db/backends/base/operations.py2
4 files changed, 4 insertions, 7 deletions
diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py
index 5c0e8755ea..ad6b4f3df1 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 35cabba0cf..a077950627 100644
--- a/django/db/backends/base/creation.py
+++ b/django/db/backends/base/creation.py
@@ -13,7 +13,6 @@ from django.utils.encoding import force_bytes
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 f535a8792d..870edde382 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.db.backends import utils