mirror of https://github.com/django/django.git
[2.2.x] Reverted "Fixed relative paths imports per isort 4.3.5."
This reverts commit463fe11bc8
due to restore of relative paths sorting from isort < 4.3.5 in isort 4.3.10. Backport ofb435f82939
from master
This commit is contained in:
parent
18211d0a4d
commit
cf903c4c0b
|
@ -9,9 +9,9 @@ from django.db.models.lookups import Exact, In
|
||||||
from django.utils.inspect import func_supports_parameter
|
from django.utils.inspect import func_supports_parameter
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
from ..utils import prefix_validation_error
|
||||||
from .mixins import CheckFieldDefaultMixin
|
from .mixins import CheckFieldDefaultMixin
|
||||||
from .utils import AttributeSetter
|
from .utils import AttributeSetter
|
||||||
from ..utils import prefix_validation_error
|
|
||||||
|
|
||||||
__all__ = ['ArrayField']
|
__all__ = ['ArrayField']
|
||||||
|
|
||||||
|
|
|
@ -9,13 +9,13 @@ from django.db import NotSupportedError, connection
|
||||||
from django.db.models import F, Q
|
from django.db.models import F, Q
|
||||||
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
|
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
|
||||||
|
|
||||||
|
from ..utils import (
|
||||||
|
FuncTestMixin, mysql, no_oracle, oracle, postgis, spatialite,
|
||||||
|
)
|
||||||
from .models import (
|
from .models import (
|
||||||
AustraliaCity, CensusZipcode, Interstate, SouthTexasCity, SouthTexasCityFt,
|
AustraliaCity, CensusZipcode, Interstate, SouthTexasCity, SouthTexasCityFt,
|
||||||
SouthTexasInterstate, SouthTexasZipcode,
|
SouthTexasInterstate, SouthTexasZipcode,
|
||||||
)
|
)
|
||||||
from ..utils import (
|
|
||||||
FuncTestMixin, mysql, no_oracle, oracle, postgis, spatialite,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class DistanceTest(TestCase):
|
class DistanceTest(TestCase):
|
||||||
|
|
|
@ -8,11 +8,11 @@ from django.contrib.gis.db.models.functions import (
|
||||||
from django.contrib.gis.geos import GEOSGeometry, LineString, Point, Polygon
|
from django.contrib.gis.geos import GEOSGeometry, LineString, Point, Polygon
|
||||||
from django.test import TestCase, skipUnlessDBFeature
|
from django.test import TestCase, skipUnlessDBFeature
|
||||||
|
|
||||||
|
from ..utils import FuncTestMixin
|
||||||
from .models import (
|
from .models import (
|
||||||
City3D, Interstate2D, Interstate3D, InterstateProj2D, InterstateProj3D,
|
City3D, Interstate2D, Interstate3D, InterstateProj2D, InterstateProj3D,
|
||||||
MultiPoint3D, Point2D, Point3D, Polygon2D, Polygon3D,
|
MultiPoint3D, Point2D, Point3D, Polygon2D, Polygon3D,
|
||||||
)
|
)
|
||||||
from ..utils import FuncTestMixin
|
|
||||||
|
|
||||||
data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
|
data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
|
||||||
city_file = os.path.join(data_path, 'cities', 'cities.shp')
|
city_file = os.path.join(data_path, 'cities', 'cities.shp')
|
||||||
|
|
|
@ -6,8 +6,8 @@ from django.db import connection
|
||||||
from django.db.models import Count, Min
|
from django.db.models import Count, Min
|
||||||
from django.test import TestCase, skipUnlessDBFeature
|
from django.test import TestCase, skipUnlessDBFeature
|
||||||
|
|
||||||
from .models import City, ManyPointModel, MultiFields
|
|
||||||
from ..utils import postgis
|
from ..utils import postgis
|
||||||
|
from .models import City, ManyPointModel, MultiFields
|
||||||
|
|
||||||
|
|
||||||
class GeoExpressionsTests(TestCase):
|
class GeoExpressionsTests(TestCase):
|
||||||
|
|
|
@ -13,8 +13,8 @@ from django.db.models import Sum
|
||||||
from django.test import TestCase, ignore_warnings, skipUnlessDBFeature
|
from django.test import TestCase, ignore_warnings, skipUnlessDBFeature
|
||||||
from django.utils.deprecation import RemovedInDjango30Warning
|
from django.utils.deprecation import RemovedInDjango30Warning
|
||||||
|
|
||||||
from .models import City, Country, CountryWebMercator, State, Track
|
|
||||||
from ..utils import FuncTestMixin, mysql, oracle, postgis, spatialite
|
from ..utils import FuncTestMixin, mysql, oracle, postgis, spatialite
|
||||||
|
from .models import City, Country, CountryWebMercator, State, Track
|
||||||
|
|
||||||
|
|
||||||
class GISFunctionsTests(FuncTestMixin, TestCase):
|
class GISFunctionsTests(FuncTestMixin, TestCase):
|
||||||
|
|
|
@ -5,8 +5,8 @@ from django.contrib.gis.shortcuts import render_to_kmz
|
||||||
from django.db.models import Count, Min
|
from django.db.models import Count, Min
|
||||||
from django.test import TestCase, skipUnlessDBFeature
|
from django.test import TestCase, skipUnlessDBFeature
|
||||||
|
|
||||||
from .models import City, PennsylvaniaCity, State, Truth
|
|
||||||
from ..utils import no_oracle
|
from ..utils import no_oracle
|
||||||
|
from .models import City, PennsylvaniaCity, State, Truth
|
||||||
|
|
||||||
|
|
||||||
class GeoRegressionTests(TestCase):
|
class GeoRegressionTests(TestCase):
|
||||||
|
|
|
@ -11,13 +11,13 @@ from django.core.management import call_command
|
||||||
from django.db import NotSupportedError, connection
|
from django.db import NotSupportedError, connection
|
||||||
from django.test import TestCase, skipUnlessDBFeature
|
from django.test import TestCase, skipUnlessDBFeature
|
||||||
|
|
||||||
|
from ..utils import (
|
||||||
|
mysql, no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite,
|
||||||
|
)
|
||||||
from .models import (
|
from .models import (
|
||||||
City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity,
|
City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity,
|
||||||
State, Track,
|
State, Track,
|
||||||
)
|
)
|
||||||
from ..utils import (
|
|
||||||
mysql, no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class GeoModelTest(TestCase):
|
class GeoModelTest(TestCase):
|
||||||
|
|
|
@ -11,8 +11,8 @@ from django.db import NotSupportedError, connection
|
||||||
from django.db.models.functions import Cast
|
from django.db.models.functions import Cast
|
||||||
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
|
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
|
||||||
|
|
||||||
from .models import City, County, Zipcode
|
|
||||||
from ..utils import FuncTestMixin, oracle, postgis, spatialite
|
from ..utils import FuncTestMixin, oracle, postgis, spatialite
|
||||||
|
from .models import City, County, Zipcode
|
||||||
|
|
||||||
|
|
||||||
class GeographyTest(TestCase):
|
class GeographyTest(TestCase):
|
||||||
|
|
|
@ -9,9 +9,9 @@ from django.db import connection, connections
|
||||||
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
|
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
|
||||||
from django.test.utils import modify_settings
|
from django.test.utils import modify_settings
|
||||||
|
|
||||||
from .models import AllOGRFields
|
|
||||||
from ..test_data import TEST_DATA
|
from ..test_data import TEST_DATA
|
||||||
from ..utils import postgis
|
from ..utils import postgis
|
||||||
|
from .models import AllOGRFields
|
||||||
|
|
||||||
|
|
||||||
class InspectDbTests(TestCase):
|
class InspectDbTests(TestCase):
|
||||||
|
|
|
@ -12,8 +12,8 @@ from django.db.models import Q
|
||||||
from django.test import TransactionTestCase, skipUnlessDBFeature
|
from django.test import TransactionTestCase, skipUnlessDBFeature
|
||||||
from django.test.utils import CaptureQueriesContext
|
from django.test.utils import CaptureQueriesContext
|
||||||
|
|
||||||
from .models import RasterModel, RasterRelatedModel
|
|
||||||
from ..data.rasters.textrasters import JSON_RASTER
|
from ..data.rasters.textrasters import JSON_RASTER
|
||||||
|
from .models import RasterModel, RasterRelatedModel
|
||||||
|
|
||||||
|
|
||||||
@skipUnlessDBFeature('supports_raster')
|
@skipUnlessDBFeature('supports_raster')
|
||||||
|
|
|
@ -5,10 +5,10 @@ from django.test import TestCase, skipUnlessDBFeature
|
||||||
from django.test.utils import override_settings
|
from django.test.utils import override_settings
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
|
from ..utils import no_oracle
|
||||||
from .models import (
|
from .models import (
|
||||||
Article, Author, Book, City, DirectoryEntry, Event, Location, Parcel,
|
Article, Author, Book, City, DirectoryEntry, Event, Location, Parcel,
|
||||||
)
|
)
|
||||||
from ..utils import no_oracle
|
|
||||||
|
|
||||||
|
|
||||||
class RelatedGeoModelTest(TestCase):
|
class RelatedGeoModelTest(TestCase):
|
||||||
|
|
|
@ -4,8 +4,8 @@ from django.template.defaultfilters import date
|
||||||
from django.test import SimpleTestCase, override_settings
|
from django.test import SimpleTestCase, override_settings
|
||||||
from django.utils import timezone, translation
|
from django.utils import timezone, translation
|
||||||
|
|
||||||
from .timezone_utils import TimezoneTestCase
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .timezone_utils import TimezoneTestCase
|
||||||
|
|
||||||
|
|
||||||
class DateTests(TimezoneTestCase):
|
class DateTests(TimezoneTestCase):
|
||||||
|
|
|
@ -4,8 +4,8 @@ from django.template.defaultfilters import time as time_filter
|
||||||
from django.test import SimpleTestCase, override_settings
|
from django.test import SimpleTestCase, override_settings
|
||||||
from django.utils import timezone, translation
|
from django.utils import timezone, translation
|
||||||
|
|
||||||
from .timezone_utils import TimezoneTestCase
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .timezone_utils import TimezoneTestCase
|
||||||
|
|
||||||
|
|
||||||
class TimeTests(TimezoneTestCase):
|
class TimeTests(TimezoneTestCase):
|
||||||
|
|
|
@ -4,8 +4,8 @@ from django.template.defaultfilters import timesince_filter
|
||||||
from django.test import SimpleTestCase
|
from django.test import SimpleTestCase
|
||||||
from django.test.utils import requires_tz_support
|
from django.test.utils import requires_tz_support
|
||||||
|
|
||||||
from .timezone_utils import TimezoneTestCase
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .timezone_utils import TimezoneTestCase
|
||||||
|
|
||||||
|
|
||||||
class TimesinceTests(TimezoneTestCase):
|
class TimesinceTests(TimezoneTestCase):
|
||||||
|
|
|
@ -4,8 +4,8 @@ from django.template.defaultfilters import timeuntil_filter
|
||||||
from django.test import SimpleTestCase
|
from django.test import SimpleTestCase
|
||||||
from django.test.utils import requires_tz_support
|
from django.test.utils import requires_tz_support
|
||||||
|
|
||||||
from .timezone_utils import TimezoneTestCase
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .timezone_utils import TimezoneTestCase
|
||||||
|
|
||||||
|
|
||||||
class TimeuntilTests(TimezoneTestCase):
|
class TimeuntilTests(TimezoneTestCase):
|
||||||
|
|
|
@ -7,8 +7,8 @@ from django.utils import translation
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.utils.translation import trans_real
|
from django.utils.translation import trans_real
|
||||||
|
|
||||||
from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here
|
|
||||||
from ...utils import setup
|
from ...utils import setup
|
||||||
|
from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here
|
||||||
|
|
||||||
|
|
||||||
class I18nBlockTransTagTests(SimpleTestCase):
|
class I18nBlockTransTagTests(SimpleTestCase):
|
||||||
|
|
|
@ -7,8 +7,8 @@ from django.utils import translation
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.utils.translation import trans_real
|
from django.utils.translation import trans_real
|
||||||
|
|
||||||
from .base import MultipleLocaleActivationTestCase, extended_locale_paths
|
|
||||||
from ...utils import setup
|
from ...utils import setup
|
||||||
|
from .base import MultipleLocaleActivationTestCase, extended_locale_paths
|
||||||
|
|
||||||
|
|
||||||
class I18nTransTagTests(SimpleTestCase):
|
class I18nTransTagTests(SimpleTestCase):
|
||||||
|
|
|
@ -2,8 +2,8 @@ from django.template import Context, Template
|
||||||
from django.test import SimpleTestCase
|
from django.test import SimpleTestCase
|
||||||
from django.utils import translation
|
from django.utils import translation
|
||||||
|
|
||||||
from .base import MultipleLocaleActivationTestCase
|
|
||||||
from ...utils import setup
|
from ...utils import setup
|
||||||
|
from .base import MultipleLocaleActivationTestCase
|
||||||
|
|
||||||
|
|
||||||
class MultipleLocaleActivationTests(MultipleLocaleActivationTestCase):
|
class MultipleLocaleActivationTests(MultipleLocaleActivationTestCase):
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from django.template import TemplateDoesNotExist, TemplateSyntaxError
|
from django.template import TemplateDoesNotExist, TemplateSyntaxError
|
||||||
from django.test import SimpleTestCase
|
from django.test import SimpleTestCase
|
||||||
|
|
||||||
from .test_extends import inheritance_templates
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .test_extends import inheritance_templates
|
||||||
|
|
||||||
|
|
||||||
class ExceptionsTests(SimpleTestCase):
|
class ExceptionsTests(SimpleTestCase):
|
||||||
|
|
|
@ -3,8 +3,8 @@ from django.template import (
|
||||||
)
|
)
|
||||||
from django.test import SimpleTestCase
|
from django.test import SimpleTestCase
|
||||||
|
|
||||||
from .test_basic import basic_templates
|
|
||||||
from ..utils import setup
|
from ..utils import setup
|
||||||
|
from .test_basic import basic_templates
|
||||||
|
|
||||||
include_fail_templates = {
|
include_fail_templates = {
|
||||||
'include-fail1': '{% load bad_tag %}{% badtag %}',
|
'include-fail1': '{% load bad_tag %}{% badtag %}',
|
||||||
|
|
Loading…
Reference in New Issue