[1.11.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.
This commit is contained in:
parent
b9beb6a52e
commit
f13bfdeb55
@ -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']
|
||||
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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')
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
|
@ -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 %}',
|
||||
|
Loading…
x
Reference in New Issue
Block a user