diff options
| author | Tim Graham <timograham@gmail.com> | 2016-04-03 21:41:37 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-04-04 17:14:27 -0400 |
| commit | 6448873197fa4e3df3f5f03201538dc57d7643d6 (patch) | |
| tree | 0b09458bfee7ac89a2a76c280a00def497b77856 | |
| parent | 2cd2d188516475ddf256e6267cd82c495fb5c430 (diff) | |
Fixed E402 flake8 warnings.
| -rw-r--r-- | django/contrib/gis/measure.py | 3 | ||||
| -rw-r--r-- | django/db/backends/oracle/base.py | 14 | ||||
| -rw-r--r-- | django/db/backends/postgresql/base.py | 16 | ||||
| -rw-r--r-- | 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 52fdf874ca..0981c7e09b 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 43b435fed4..62b17fbe42 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 2f3b00bfb6..8819c39d31 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 @@ -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] |