From 6448873197fa4e3df3f5f03201538dc57d7643d6 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sun, 3 Apr 2016 21:41:37 -0400 Subject: [PATCH] Fixed E402 flake8 warnings. --- django/contrib/gis/measure.py | 3 ++- django/db/backends/oracle/base.py | 14 +++++++------- django/db/backends/postgresql/base.py | 16 ++++++++-------- setup.cfg | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py index 52fdf874ca8..0981c7e09b5 100644 --- a/django/contrib/gis/measure.py +++ b/django/contrib/gis/measure.py @@ -35,12 +35,13 @@ Authors: Robert Coup, Justin Bronn, Riccardo Di Virgilio Inspired by GeoPy (http://exogen.case.edu/projects/geopy/) and Geoff Biggs' PhD work on dimensioned units for robotics. """ -__all__ = ['A', 'Area', 'D', 'Distance'] from decimal import Decimal from functools import total_ordering from django.utils import six +__all__ = ['A', 'Area', 'D', 'Distance'] + NUMERIC_TYPES = six.integer_types + (float, Decimal) AREA_PREFIX = "sq_" diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 43b435fed47..62b17fbe421 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -56,13 +56,13 @@ except ImportError as e: raise ImproperlyConfigured("Error loading cx_Oracle module: %s" % e) # Some of these import cx_Oracle, so import them after checking if it's installed. -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 Oracle_datetime, convert_unicode # isort:skip +from .client import DatabaseClient # NOQA isort:skip +from .creation import DatabaseCreation # NOQA isort:skip +from .features import DatabaseFeatures # NOQA isort:skip +from .introspection import DatabaseIntrospection # NOQA isort:skip +from .operations import DatabaseOperations # NOQA isort:skip +from .schema import DatabaseSchemaEditor # NOQA isort:skip +from .utils import Oracle_datetime, convert_unicode # NOQA isort:skip DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index 2f3b00bfb66..8819c39d317 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -35,14 +35,14 @@ if PSYCOPG2_VERSION < (2, 4, 5): # Some of these import psycopg2, so import them after checking if it's installed. -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 utc_tzinfo_factory # isort:skip -from .version import get_version # isort:skip +from .client import DatabaseClient # NOQA isort:skip +from .creation import DatabaseCreation # NOQA isort:skip +from .features import DatabaseFeatures # NOQA isort:skip +from .introspection import DatabaseIntrospection # NOQA isort:skip +from .operations import DatabaseOperations # NOQA isort:skip +from .schema import DatabaseSchemaEditor # NOQA isort:skip +from .utils import utc_tzinfo_factory # NOQA isort:skip +from .version import get_version # NOQA isort:skip DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError diff --git a/setup.cfg b/setup.cfg index 580b41c3494..271b443b4f7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ install-script = scripts/rpm-install.sh [flake8] exclude = build,.git,./django/utils/lru_cache.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py,./tests/.env,./xmlrunner,tests/view_tests/tests/py3_test_debug.py,tests/template_tests/annotated_tag_function.py -ignore = E128,E402,W601 +ignore = E128,W601 max-line-length = 119 [isort]