From 1999c0a00aec9736a58a235d90c9ef5a6f9cff34 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 3 Mar 2019 19:33:48 +0100 Subject: [PATCH] [2.1.x] Reverted "Fixed relative paths imports per isort 4.3.5." This reverts commit 463fe11bc8b2d068e447c5df677e7a31c2af7e03 due to restore of relative paths sorting from isort < 4.3.5 in isort 4.3.10. Backport of b435f82939edf70674856e0e1cd63973c2e0a1d1 from master --- django/contrib/postgres/fields/array.py | 2 +- tests/gis_tests/distapp/tests.py | 6 +++--- tests/gis_tests/geo3d/tests.py | 2 +- tests/gis_tests/geoapp/test_expressions.py | 2 +- tests/gis_tests/geoapp/test_functions.py | 2 +- tests/gis_tests/geoapp/test_regress.py | 2 +- tests/gis_tests/geoapp/tests.py | 6 +++--- tests/gis_tests/geogapp/tests.py | 2 +- tests/gis_tests/inspectapp/tests.py | 2 +- tests/gis_tests/rasterapp/test_rasterfield.py | 2 +- tests/gis_tests/relatedapp/tests.py | 2 +- tests/template_tests/filter_tests/test_date.py | 2 +- tests/template_tests/filter_tests/test_time.py | 2 +- tests/template_tests/filter_tests/test_timesince.py | 2 +- tests/template_tests/filter_tests/test_timeuntil.py | 2 +- tests/template_tests/syntax_tests/i18n/test_blocktrans.py | 2 +- tests/template_tests/syntax_tests/i18n/test_trans.py | 2 +- .../syntax_tests/i18n/test_underscore_syntax.py | 2 +- tests/template_tests/syntax_tests/test_exceptions.py | 2 +- tests/template_tests/syntax_tests/test_include.py | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index da43bd328a..ab667acd5b 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -9,9 +9,9 @@ from django.db.models.lookups import Exact, In from django.utils.inspect import func_supports_parameter from django.utils.translation import gettext_lazy as _ +from ..utils import prefix_validation_error from .mixins import CheckFieldDefaultMixin from .utils import AttributeSetter -from ..utils import prefix_validation_error __all__ = ['ArrayField'] diff --git a/tests/gis_tests/distapp/tests.py b/tests/gis_tests/distapp/tests.py index f526fd0edb..67558582dc 100644 --- a/tests/gis_tests/distapp/tests.py +++ b/tests/gis_tests/distapp/tests.py @@ -9,13 +9,13 @@ from django.db import NotSupportedError, connection from django.db.models import F, Q from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature +from ..utils import ( + FuncTestMixin, mysql, no_oracle, oracle, postgis, spatialite, +) from .models import ( AustraliaCity, CensusZipcode, Interstate, SouthTexasCity, SouthTexasCityFt, SouthTexasInterstate, SouthTexasZipcode, ) -from ..utils import ( - FuncTestMixin, mysql, no_oracle, oracle, postgis, spatialite, -) class DistanceTest(TestCase): diff --git a/tests/gis_tests/geo3d/tests.py b/tests/gis_tests/geo3d/tests.py index a82bd47bd2..d2e85f0607 100644 --- a/tests/gis_tests/geo3d/tests.py +++ b/tests/gis_tests/geo3d/tests.py @@ -8,11 +8,11 @@ from django.contrib.gis.db.models.functions import ( from django.contrib.gis.geos import GEOSGeometry, LineString, Point, Polygon from django.test import TestCase, skipUnlessDBFeature +from ..utils import FuncTestMixin from .models import ( City3D, Interstate2D, Interstate3D, InterstateProj2D, InterstateProj3D, MultiPoint3D, Point2D, Point3D, Polygon2D, Polygon3D, ) -from ..utils import FuncTestMixin data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data')) city_file = os.path.join(data_path, 'cities', 'cities.shp') diff --git a/tests/gis_tests/geoapp/test_expressions.py b/tests/gis_tests/geoapp/test_expressions.py index 28a2eae541..89e83a782f 100644 --- a/tests/gis_tests/geoapp/test_expressions.py +++ b/tests/gis_tests/geoapp/test_expressions.py @@ -6,8 +6,8 @@ from django.db import connection from django.db.models import Count, Min from django.test import TestCase, skipUnlessDBFeature -from .models import City, ManyPointModel, MultiFields from ..utils import postgis +from .models import City, ManyPointModel, MultiFields class GeoExpressionsTests(TestCase): diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index f1fef42f5d..2449650567 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -13,8 +13,8 @@ from django.db.models import Sum from django.test import TestCase, ignore_warnings, skipUnlessDBFeature from django.utils.deprecation import RemovedInDjango30Warning -from .models import City, Country, CountryWebMercator, State, Track from ..utils import FuncTestMixin, mysql, oracle, postgis, spatialite +from .models import City, Country, CountryWebMercator, State, Track class GISFunctionsTests(FuncTestMixin, TestCase): diff --git a/tests/gis_tests/geoapp/test_regress.py b/tests/gis_tests/geoapp/test_regress.py index 03da923673..661124dcba 100644 --- a/tests/gis_tests/geoapp/test_regress.py +++ b/tests/gis_tests/geoapp/test_regress.py @@ -5,8 +5,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 cb8137db9f..6f07f3b7b6 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -11,13 +11,13 @@ from django.core.management import call_command from django.db import NotSupportedError, connection from django.test import TestCase, skipUnlessDBFeature +from ..utils import ( + mysql, no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite, +) from .models import ( City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity, State, Track, ) -from ..utils import ( - mysql, no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite, -) class GeoModelTest(TestCase): diff --git a/tests/gis_tests/geogapp/tests.py b/tests/gis_tests/geogapp/tests.py index 8e0b844546..7f6c441ba5 100644 --- a/tests/gis_tests/geogapp/tests.py +++ b/tests/gis_tests/geogapp/tests.py @@ -11,8 +11,8 @@ from django.db import NotSupportedError, connection from django.db.models.functions import Cast from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature -from .models import City, County, Zipcode from ..utils import FuncTestMixin, 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 a96d2aac74..efc3c9ad6c 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -9,9 +9,9 @@ from django.db import connection, connections from django.test import TestCase, skipUnlessDBFeature from django.test.utils import modify_settings -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 68df878502..cf64e8a82c 100644 --- a/tests/gis_tests/rasterapp/test_rasterfield.py +++ b/tests/gis_tests/rasterapp/test_rasterfield.py @@ -12,8 +12,8 @@ from django.db.models import Q from django.test import TransactionTestCase, skipUnlessDBFeature from django.test.utils import CaptureQueriesContext -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 dfa73b4df6..5f003b78f2 100644 --- a/tests/gis_tests/relatedapp/tests.py +++ b/tests/gis_tests/relatedapp/tests.py @@ -5,10 +5,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 2163984ab3..f973c229b9 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 f9a9b26f34..919417dc12 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 d2fed6720c..7fe4831d61 100644 --- a/tests/template_tests/filter_tests/test_timesince.py +++ b/tests/template_tests/filter_tests/test_timesince.py @@ -4,8 +4,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 0054cda235..f3a211c626 100644 --- a/tests/template_tests/filter_tests/test_timeuntil.py +++ b/tests/template_tests/filter_tests/test_timeuntil.py @@ -4,8 +4,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 da4f876063..ac8fc16da8 100644 --- a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py +++ b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py @@ -7,8 +7,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 e3d8963c7f..ba5021a5d5 100644 --- a/tests/template_tests/syntax_tests/i18n/test_trans.py +++ b/tests/template_tests/syntax_tests/i18n/test_trans.py @@ -7,8 +7,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 c422122ef1..38d929e214 100644 --- a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py +++ b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py @@ -2,8 +2,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 bb250c049d..8587639674 100644 --- a/tests/template_tests/syntax_tests/test_include.py +++ b/tests/template_tests/syntax_tests/test_include.py @@ -3,8 +3,8 @@ from django.template import ( ) from django.test import SimpleTestCase -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 %}',