From 0ed7d155635da9f79d4dd67e4889087d3673c6da Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 28 Jan 2015 07:35:27 -0500 Subject: Sorted imports with isort; refs #23860. --- django/db/backends/sqlite3/base.py | 14 +++++++------- django/db/backends/sqlite3/introspection.py | 1 - django/db/backends/sqlite3/operations.py | 6 +++--- django/db/backends/sqlite3/schema.py | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) (limited to 'django/db/backends/sqlite3') diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index a71bae99b2..84d24e5bfe 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -36,13 +36,13 @@ except ImportError as exc: raise ImproperlyConfigured("Error loading either pysqlite2 or sqlite3 modules (tried in that order): %s" % exc) # Some of these import sqlite3, so import them after checking if it's installed. -from .client import DatabaseClient -from .creation import DatabaseCreation -from .features import DatabaseFeatures -from .introspection import DatabaseIntrospection -from .operations import DatabaseOperations -from .schema import DatabaseSchemaEditor -from .utils import parse_datetime_with_timezone_support +from .client import DatabaseClient # isort:skip +from .creation import DatabaseCreation # isort:skip +from .features import DatabaseFeatures # isort:skip +from .introspection import DatabaseIntrospection # isort:skip +from .operations import DatabaseOperations # isort:skip +from .schema import DatabaseSchemaEditor # isort:skip +from .utils import parse_datetime_with_timezone_support # isort:skip DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index a002b79933..5f3fb4a45d 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -5,7 +5,6 @@ from django.db.backends.base.introspection import ( BaseDatabaseIntrospection, FieldInfo, TableInfo, ) - field_size_re = re.compile(r'^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$') FieldInfo = namedtuple('FieldInfo', FieldInfo._fields + ('default',)) diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index cd29092cd7..5d974f36df 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -4,14 +4,14 @@ import datetime import uuid from django.conf import settings -from django.core.exceptions import ImproperlyConfigured, FieldError +from django.core.exceptions import FieldError, ImproperlyConfigured from django.db import utils from django.db.backends import utils as backend_utils from django.db.backends.base.operations import BaseDatabaseOperations -from django.db.models import fields, aggregates +from django.db.models import aggregates, fields +from django.utils import six, timezone from django.utils.dateparse import parse_date, parse_time from django.utils.duration import duration_string -from django.utils import six, timezone from .utils import parse_datetime_with_timezone_support diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py index 031bf77840..0d101b0f27 100644 --- a/django/db/backends/sqlite3/schema.py +++ b/django/db/backends/sqlite3/schema.py @@ -2,12 +2,12 @@ import codecs import copy from decimal import Decimal +import _sqlite3 + from django.apps.registry import Apps from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.utils import six -import _sqlite3 - class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): -- cgit v1.3