From d8426f64a75356832655c457be3c9761102d9cf1 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 27 Aug 2025 10:57:08 +0100 Subject: [PATCH] Fixed #36577 -- Removed obsolete try-except for GIS layermapping imports. --- django/contrib/gis/utils/__init__.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/django/contrib/gis/utils/__init__.py b/django/contrib/gis/utils/__init__.py index 92ff64dee7..807cff68d7 100644 --- a/django/contrib/gis/utils/__init__.py +++ b/django/contrib/gis/utils/__init__.py @@ -2,24 +2,16 @@ This module contains useful utilities for GeoDjango. """ +from django.contrib.gis.utils.layermapping import LayerMapError, LayerMapping from django.contrib.gis.utils.ogrinfo import ogrinfo from django.contrib.gis.utils.ogrinspect import mapping, ogrinspect from django.contrib.gis.utils.srs import add_srs_entry -from django.core.exceptions import ImproperlyConfigured __all__ = [ "add_srs_entry", "mapping", "ogrinfo", "ogrinspect", + "LayerMapError", + "LayerMapping", ] - -try: - # LayerMapping requires DJANGO_SETTINGS_MODULE to be set, - # and ImproperlyConfigured is raised if that's not the case. - from django.contrib.gis.utils.layermapping import LayerMapError, LayerMapping - - __all__ += ["LayerMapError", "LayerMapping"] - -except ImproperlyConfigured: - pass