diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index d6848c3f32..b70ae37a3a 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -9,8 +9,8 @@ from django.db.models.lookups import Exact, In from django.utils import six from django.utils.translation import ugettext_lazy as _ -from .utils import AttributeSetter from ..utils import prefix_validation_error +from .utils import AttributeSetter __all__ = ['ArrayField'] diff --git a/tests/gis_tests/distapp/tests.py b/tests/gis_tests/distapp/tests.py index 136b1f957f..4609083f3b 100644 --- a/tests/gis_tests/distapp/tests.py +++ b/tests/gis_tests/distapp/tests.py @@ -12,11 +12,11 @@ from django.db.models import F, Q from django.test import TestCase, ignore_warnings, skipUnlessDBFeature from django.utils.deprecation import RemovedInDjango20Warning +from ..utils import no_oracle, oracle, postgis, spatialite from .models import ( AustraliaCity, CensusZipcode, Interstate, SouthTexasCity, SouthTexasCityFt, SouthTexasInterstate, SouthTexasZipcode, ) -from ..utils import no_oracle, oracle, postgis, spatialite class DistanceTest(TestCase): diff --git a/tests/gis_tests/geoapp/test_expressions.py b/tests/gis_tests/geoapp/test_expressions.py index f756858583..503b706f0e 100644 --- a/tests/gis_tests/geoapp/test_expressions.py +++ b/tests/gis_tests/geoapp/test_expressions.py @@ -4,8 +4,8 @@ from django.contrib.gis.db.models import GeometryField, Value, functions from django.contrib.gis.geos import Point, Polygon from django.test import TestCase, skipUnlessDBFeature -from .models import City from ..utils import postgis +from .models import City class GeoExpressionsTests(TestCase): diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index 2428e248a4..a3ffc40ecd 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -11,8 +11,8 @@ from django.db.models import Sum from django.test import TestCase, skipUnlessDBFeature from django.utils import six -from .models import City, Country, CountryWebMercator, State, Track from ..utils import mysql, oracle, postgis, spatialite +from .models import City, Country, CountryWebMercator, State, Track class GISFunctionsTests(TestCase): diff --git a/tests/gis_tests/geoapp/test_regress.py b/tests/gis_tests/geoapp/test_regress.py index 3b050db547..a9d160c534 100644 --- a/tests/gis_tests/geoapp/test_regress.py +++ b/tests/gis_tests/geoapp/test_regress.py @@ -8,8 +8,8 @@ from django.contrib.gis.shortcuts import render_to_kmz from django.db.models import Count, Min from django.test import TestCase, skipUnlessDBFeature -from .models import City, PennsylvaniaCity, State, Truth from ..utils import no_oracle +from .models import City, PennsylvaniaCity, State, Truth class GeoRegressionTests(TestCase): diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index 183fcd5047..b6a5c2d0c8 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -15,11 +15,11 @@ from django.test import TestCase, ignore_warnings, skipUnlessDBFeature from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning +from ..utils import oracle, postgis, skipUnlessGISLookup, spatialite from .models import ( City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity, State, Track, ) -from ..utils import oracle, postgis, skipUnlessGISLookup, spatialite class GeoModelTest(TestCase): diff --git a/tests/gis_tests/geogapp/tests.py b/tests/gis_tests/geogapp/tests.py index 72041e805b..a23dad3a53 100644 --- a/tests/gis_tests/geogapp/tests.py +++ b/tests/gis_tests/geogapp/tests.py @@ -17,8 +17,8 @@ from django.test import ( from django.utils._os import upath from django.utils.deprecation import RemovedInDjango20Warning -from .models import City, County, Zipcode from ..utils import oracle, postgis, spatialite +from .models import City, County, Zipcode class GeographyTest(TestCase): diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index afd39b6f5c..23980f860c 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -11,9 +11,9 @@ from django.test import TestCase, skipUnlessDBFeature from django.test.utils import modify_settings from django.utils.six import StringIO -from .models import AllOGRFields from ..test_data import TEST_DATA from ..utils import postgis +from .models import AllOGRFields class InspectDbTests(TestCase): diff --git a/tests/gis_tests/rasterapp/test_rasterfield.py b/tests/gis_tests/rasterapp/test_rasterfield.py index 7f2f56996a..9628fc0170 100644 --- a/tests/gis_tests/rasterapp/test_rasterfield.py +++ b/tests/gis_tests/rasterapp/test_rasterfield.py @@ -11,8 +11,8 @@ from django.contrib.gis.shortcuts import numpy from django.db.models import Q from django.test import TransactionTestCase, skipUnlessDBFeature -from .models import RasterModel, RasterRelatedModel from ..data.rasters.textrasters import JSON_RASTER +from .models import RasterModel, RasterRelatedModel @skipUnlessDBFeature('supports_raster') diff --git a/tests/gis_tests/relatedapp/tests.py b/tests/gis_tests/relatedapp/tests.py index 35b40e176c..024c1b644a 100644 --- a/tests/gis_tests/relatedapp/tests.py +++ b/tests/gis_tests/relatedapp/tests.py @@ -8,10 +8,10 @@ from django.test import TestCase, skipUnlessDBFeature from django.test.utils import override_settings from django.utils import timezone +from ..utils import no_oracle from .models import ( Article, Author, Book, City, DirectoryEntry, Event, Location, Parcel, ) -from ..utils import no_oracle class RelatedGeoModelTest(TestCase): diff --git a/tests/template_tests/filter_tests/test_date.py b/tests/template_tests/filter_tests/test_date.py index eabb513fcb..4c83068eb8 100644 --- a/tests/template_tests/filter_tests/test_date.py +++ b/tests/template_tests/filter_tests/test_date.py @@ -4,8 +4,8 @@ from django.template.defaultfilters import date from django.test import SimpleTestCase, override_settings from django.utils import timezone, translation -from .timezone_utils import TimezoneTestCase from ..utils import setup +from .timezone_utils import TimezoneTestCase class DateTests(TimezoneTestCase): diff --git a/tests/template_tests/filter_tests/test_time.py b/tests/template_tests/filter_tests/test_time.py index a43012d229..a05624a0e1 100644 --- a/tests/template_tests/filter_tests/test_time.py +++ b/tests/template_tests/filter_tests/test_time.py @@ -4,8 +4,8 @@ from django.template.defaultfilters import time as time_filter from django.test import SimpleTestCase, override_settings from django.utils import timezone, translation -from .timezone_utils import TimezoneTestCase from ..utils import setup +from .timezone_utils import TimezoneTestCase class TimeTests(TimezoneTestCase): diff --git a/tests/template_tests/filter_tests/test_timesince.py b/tests/template_tests/filter_tests/test_timesince.py index 44dac55b7b..0cb975a90e 100644 --- a/tests/template_tests/filter_tests/test_timesince.py +++ b/tests/template_tests/filter_tests/test_timesince.py @@ -6,8 +6,8 @@ from django.template.defaultfilters import timesince_filter from django.test import SimpleTestCase from django.test.utils import requires_tz_support -from .timezone_utils import TimezoneTestCase from ..utils import setup +from .timezone_utils import TimezoneTestCase class TimesinceTests(TimezoneTestCase): diff --git a/tests/template_tests/filter_tests/test_timeuntil.py b/tests/template_tests/filter_tests/test_timeuntil.py index c26bcd0f4a..1b06a21c93 100644 --- a/tests/template_tests/filter_tests/test_timeuntil.py +++ b/tests/template_tests/filter_tests/test_timeuntil.py @@ -6,8 +6,8 @@ from django.template.defaultfilters import timeuntil_filter from django.test import SimpleTestCase from django.test.utils import requires_tz_support -from .timezone_utils import TimezoneTestCase from ..utils import setup +from .timezone_utils import TimezoneTestCase class TimeuntilTests(TimezoneTestCase): diff --git a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py index 2f37a95970..552c08b038 100644 --- a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py +++ b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py @@ -10,8 +10,8 @@ from django.utils import translation from django.utils.safestring import mark_safe from django.utils.translation import trans_real -from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here from ...utils import setup +from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here class I18nBlockTransTagTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/i18n/test_trans.py b/tests/template_tests/syntax_tests/i18n/test_trans.py index 17c4e94f0c..dd38608175 100644 --- a/tests/template_tests/syntax_tests/i18n/test_trans.py +++ b/tests/template_tests/syntax_tests/i18n/test_trans.py @@ -8,8 +8,8 @@ from django.utils import translation from django.utils.safestring import mark_safe from django.utils.translation import trans_real -from .base import MultipleLocaleActivationTestCase, extended_locale_paths from ...utils import setup +from .base import MultipleLocaleActivationTestCase, extended_locale_paths class I18nTransTagTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py index 930508c3ac..aed204d63b 100644 --- a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py +++ b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py @@ -4,8 +4,8 @@ from django.template import Context, Template from django.test import SimpleTestCase from django.utils import translation -from .base import MultipleLocaleActivationTestCase from ...utils import setup +from .base import MultipleLocaleActivationTestCase class MultipleLocaleActivationTests(MultipleLocaleActivationTestCase): diff --git a/tests/template_tests/syntax_tests/test_exceptions.py b/tests/template_tests/syntax_tests/test_exceptions.py index e3645cb13f..db1e0f9f5f 100644 --- a/tests/template_tests/syntax_tests/test_exceptions.py +++ b/tests/template_tests/syntax_tests/test_exceptions.py @@ -1,8 +1,8 @@ from django.template import TemplateDoesNotExist, TemplateSyntaxError from django.test import SimpleTestCase -from .test_extends import inheritance_templates from ..utils import setup +from .test_extends import inheritance_templates class ExceptionsTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/test_include.py b/tests/template_tests/syntax_tests/test_include.py index 6f65c85ac1..3368522065 100644 --- a/tests/template_tests/syntax_tests/test_include.py +++ b/tests/template_tests/syntax_tests/test_include.py @@ -6,8 +6,8 @@ from django.template import ( from django.test import SimpleTestCase, ignore_warnings from django.utils.deprecation import RemovedInDjango21Warning -from .test_basic import basic_templates from ..utils import setup +from .test_basic import basic_templates include_fail_templates = { 'include-fail1': '{% load bad_tag %}{% badtag %}',