[1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin

Backport of a37dcfd0a38cff24eb4fb5e3858791aa5428c853 from master

3 files changed, 25 insertions, 24 deletions

diff --git a/django/contrib/gis/admin/__init__.py b/django/contrib/gis/admin/__init__.py
index fdf7166306..79e51e4303 100644
--- a/django/contrib/gis/admin/__init__.py
+++ b/django/contrib/gis/admin/__init__.py
@@ -1,21 +1,14 @@
 # Getting the normal admin routines, classes, and `site` instance.
-from django.contrib.admin import (  # NOQA: flake8 detects only the last __all__
+from django.contrib.admin import (
     autodiscover, site, AdminSite, ModelAdmin, StackedInline, TabularInline,
     HORIZONTAL, VERTICAL,
 )
 # Geographic admin options classes and widgets.
-from django.contrib.gis.admin.options import GeoModelAdmin      # NOQA
-from django.contrib.gis.admin.widgets import OpenLayersWidget   # NOQA
+from django.contrib.gis.admin.options import GeoModelAdmin, OSMGeoAdmin
+from django.contrib.gis.admin.widgets import OpenLayersWidget
 
 __all__ = [
-    "autodiscover", "site", "AdminSite", "ModelAdmin", "StackedInline",
-    "TabularInline", "HORIZONTAL", "VERTICAL",
-    "GeoModelAdmin", "OpenLayersWidget", "HAS_OSM",
+    'autodiscover', 'site', 'AdminSite', 'ModelAdmin', 'StackedInline',
+    'TabularInline', 'HORIZONTAL', 'VERTICAL', 'GeoModelAdmin', 'OSMGeoAdmin',
+    'OpenLayersWidget',
 ]
-
-try:
-    from django.contrib.gis.admin.options import OSMGeoAdmin
-    HAS_OSM = True
-    __all__ += ['OSMGeoAdmin']
-except ImportError:
-    HAS_OSM = False
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
index f9412336e3..dca46829fd 100644
--- a/django/contrib/gis/admin/options.py
+++ b/django/contrib/gis/admin/options.py
@@ -2,6 +2,9 @@ from django.contrib.admin import ModelAdmin
 from django.contrib.gis.admin.widgets import OpenLayersWidget
 from django.contrib.gis.db import models
 from django.contrib.gis.gdal import HAS_GDAL, OGRGeomType
+from django.core.exceptions import ImproperlyConfigured
+
+spherical_mercator_srid = 3857
 
 
 class GeoModelAdmin(ModelAdmin):
@@ -123,14 +126,17 @@ class GeoModelAdmin(ModelAdmin):
                       }
         return OLMap
 
-if HAS_GDAL:
-    spherical_mercator_srid = 3857
 
-    class OSMGeoAdmin(GeoModelAdmin):
-        map_template = 'gis/admin/osm.html'
-        num_zoom = 20
-        map_srid = spherical_mercator_srid
-        max_extent = '-20037508,-20037508,20037508,20037508'
-        max_resolution = '156543.0339'
-        point_zoom = num_zoom - 6
-        units = 'm'
+class OSMGeoAdmin(GeoModelAdmin):
+    map_template = 'gis/admin/osm.html'
+    num_zoom = 20
+    map_srid = spherical_mercator_srid
+    max_extent = '-20037508,-20037508,20037508,20037508'
+    max_resolution = '156543.0339'
+    point_zoom = num_zoom - 6
+    units = 'm'
+
+    def __init__(self, *args):
+        if not HAS_GDAL:
+            raise ImproperlyConfigured("OSMGeoAdmin is not usable without GDAL libs installed")
+        super(OSMGeoAdmin, self).__init__(*args)
diff --git a/tests/gis_tests/geoadmin/models.py b/tests/gis_tests/geoadmin/models.py
index cf8470e792..4167471367 100644
--- a/tests/gis_tests/geoadmin/models.py
+++ b/tests/gis_tests/geoadmin/models.py
@@ -1,5 +1,6 @@
 from django.contrib.gis import admin
 from django.contrib.gis.db import models
+from django.contrib.gis.gdal import HAS_GDAL
 from django.utils.encoding import python_2_unicode_compatible
 
 
@@ -16,4 +17,5 @@ class City(models.Model):
     def __str__(self):
         return self.name
 
-admin.site.register(City, admin.OSMGeoAdmin)
+if HAS_GDAL:
+    admin.site.register(City, admin.OSMGeoAdmin)