From 7c6efb3233ce01db96384483cef47769fba58ce2 Mon Sep 17 00:00:00 2001 From: Adam Chainz Date: Sat, 5 Nov 2016 11:35:58 +0100 Subject: [PATCH] Refs #26753 -- Removed obsolete workarounds in GIS tests for lack of GDAL. Missed in f7a363ee1d2039824d95f35e54219e09c5af67b0. --- tests/gis_tests/distapp/models.py | 2 +- tests/gis_tests/geo3d/models.py | 3 +-- tests/gis_tests/geoadmin/models.py | 2 +- tests/gis_tests/geoapp/models.py | 2 +- tests/gis_tests/geogapp/models.py | 3 +-- .../gis_migrations/migrations/0001_initial.py | 11 ++++---- tests/gis_tests/inspectapp/models.py | 2 +- tests/gis_tests/layermap/models.py | 3 +-- tests/gis_tests/models.py | 27 ------------------- tests/gis_tests/rasterapp/models.py | 3 +-- tests/gis_tests/relatedapp/models.py | 3 +-- 11 files changed, 14 insertions(+), 47 deletions(-) diff --git a/tests/gis_tests/distapp/models.py b/tests/gis_tests/distapp/models.py index 1632988534f..be4cf50f959 100644 --- a/tests/gis_tests/distapp/models.py +++ b/tests/gis_tests/distapp/models.py @@ -1,6 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models from ..utils import gisfield_may_be_null diff --git a/tests/gis_tests/geo3d/models.py b/tests/gis_tests/geo3d/models.py index bcb9e2dc57e..f2ea0e02d9c 100644 --- a/tests/gis_tests/geo3d/models.py +++ b/tests/gis_tests/geo3d/models.py @@ -1,7 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models - @python_2_unicode_compatible class NamedModel(models.Model): diff --git a/tests/gis_tests/geoadmin/models.py b/tests/gis_tests/geoadmin/models.py index 6945dc03765..e57dcd7e9a3 100644 --- a/tests/gis_tests/geoadmin/models.py +++ b/tests/gis_tests/geoadmin/models.py @@ -1,7 +1,7 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible from ..admin import admin -from ..models import models @python_2_unicode_compatible diff --git a/tests/gis_tests/geoapp/models.py b/tests/gis_tests/geoapp/models.py index 764867d66f3..62103d268da 100644 --- a/tests/gis_tests/geoapp/models.py +++ b/tests/gis_tests/geoapp/models.py @@ -1,6 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models from ..utils import gisfield_may_be_null diff --git a/tests/gis_tests/geogapp/models.py b/tests/gis_tests/geogapp/models.py index d756a0c2a25..3d2a12826a2 100644 --- a/tests/gis_tests/geogapp/models.py +++ b/tests/gis_tests/geogapp/models.py @@ -1,7 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models - @python_2_unicode_compatible class NamedModel(models.Model): diff --git a/tests/gis_tests/gis_migrations/migrations/0001_initial.py b/tests/gis_tests/gis_migrations/migrations/0001_initial.py index e4545dc8aa5..d92bb3b0e25 100644 --- a/tests/gis_tests/gis_migrations/migrations/0001_initial.py +++ b/tests/gis_tests/gis_migrations/migrations/0001_initial.py @@ -1,6 +1,5 @@ -from django.db import connection, migrations, models - -from ...models import models as gis_models +from django.contrib.gis.db import models +from django.db import connection, migrations ops = [ migrations.CreateModel( @@ -8,7 +7,7 @@ ops = [ fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=100, unique=True)), - ('geom', gis_models.MultiPolygonField(srid=4326)), + ('geom', models.MultiPolygonField(srid=4326)), ], options={ 'required_db_features': ['gis_enabled'], @@ -27,7 +26,7 @@ ops = [ )), ('address', models.CharField(max_length=100)), ('zip_code', models.IntegerField(null=True, blank=True)), - ('geom', gis_models.PointField(srid=4326, geography=True)), + ('geom', models.PointField(srid=4326, geography=True)), ], options={ 'required_db_features': ['gis_enabled'], @@ -59,7 +58,7 @@ if connection.features.gis_enabled and connection.features.supports_raster: fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=100, unique=True)), - ('rast', gis_models.fields.RasterField(srid=4326)), + ('rast', models.fields.RasterField(srid=4326)), ], options={ }, diff --git a/tests/gis_tests/inspectapp/models.py b/tests/gis_tests/inspectapp/models.py index dacb4d48f62..1319ed30e40 100644 --- a/tests/gis_tests/inspectapp/models.py +++ b/tests/gis_tests/inspectapp/models.py @@ -1,4 +1,4 @@ -from ..models import models +from django.contrib.gis.db import models class AllOGRFields(models.Model): diff --git a/tests/gis_tests/layermap/models.py b/tests/gis_tests/layermap/models.py index 1e313049fbf..25dd0e4bcdd 100644 --- a/tests/gis_tests/layermap/models.py +++ b/tests/gis_tests/layermap/models.py @@ -1,7 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models - @python_2_unicode_compatible class NamedModel(models.Model): diff --git a/tests/gis_tests/models.py b/tests/gis_tests/models.py index aaedf0f8a7b..e69de29bb2d 100644 --- a/tests/gis_tests/models.py +++ b/tests/gis_tests/models.py @@ -1,27 +0,0 @@ -from django.core.exceptions import ImproperlyConfigured -from django.db import models - - -class DummyField(models.Field): - def __init__(self, dim=None, srid=None, geography=None, spatial_index=True, *args, **kwargs): - super(DummyField, self).__init__(*args, **kwargs) - - -try: - from django.contrib.gis.db import models - # Store a version of the original raster field for testing the exception - # raised if GDAL isn't installed. - models.OriginalRasterField = models.RasterField -except ImproperlyConfigured: - models.GeometryField = DummyField - models.LineStringField = DummyField - models.MultiPointField = DummyField - models.MultiPolygonField = DummyField - models.PointField = DummyField - models.PolygonField = DummyField - models.RasterField = DummyField - -try: - models.RasterField() -except ImproperlyConfigured: - models.RasterField = DummyField diff --git a/tests/gis_tests/rasterapp/models.py b/tests/gis_tests/rasterapp/models.py index 6cd97e40eba..c360d957162 100644 --- a/tests/gis_tests/rasterapp/models.py +++ b/tests/gis_tests/rasterapp/models.py @@ -1,7 +1,6 @@ +from django.contrib.gis.db import models from django.contrib.gis.gdal import HAS_GDAL -from ..models import models - if HAS_GDAL: class RasterModel(models.Model): rast = models.RasterField('A Verbose Raster Name', null=True, srid=4326, spatial_index=True, blank=True) diff --git a/tests/gis_tests/relatedapp/models.py b/tests/gis_tests/relatedapp/models.py index 0052e1797f5..32de25bd20a 100644 --- a/tests/gis_tests/relatedapp/models.py +++ b/tests/gis_tests/relatedapp/models.py @@ -1,7 +1,6 @@ +from django.contrib.gis.db import models from django.utils.encoding import python_2_unicode_compatible -from ..models import models - class SimpleModel(models.Model):