From f9c2fd30beecf34614775c067739da3cff64c243 Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Sat, 2 Sep 2017 13:52:01 +0100
Subject: [PATCH] Fixed #28559 -- Removed contrib.gis.gdal.OGRException
 backwards compatibility alias.

---
 django/contrib/gis/gdal/__init__.py | 8 ++++----
 django/contrib/gis/gdal/error.py    | 4 ----
 docs/releases/2.0.txt               | 3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/django/contrib/gis/gdal/__init__.py b/django/contrib/gis/gdal/__init__.py
index 4c217dd5b3..6893f0daf7 100644
--- a/django/contrib/gis/gdal/__init__.py
+++ b/django/contrib/gis/gdal/__init__.py
@@ -29,7 +29,7 @@ from django.contrib.gis.gdal.datasource import DataSource
 from django.contrib.gis.gdal.driver import Driver
 from django.contrib.gis.gdal.envelope import Envelope
 from django.contrib.gis.gdal.error import (
-    GDALException, OGRException, OGRIndexError, SRSException, check_err,
+    GDALException, OGRIndexError, SRSException, check_err,
 )
 from django.contrib.gis.gdal.geometries import OGRGeometry
 from django.contrib.gis.gdal.geomtype import OGRGeomType
@@ -41,7 +41,7 @@ from django.contrib.gis.gdal.srs import CoordTransform, SpatialReference
 
 __all__ = (
     'Driver', 'DataSource', 'CoordTransform', 'Envelope', 'GDALException',
-    'GDALRaster', 'GDAL_VERSION', 'OGRException', 'OGRGeometry', 'OGRGeomType',
-    'OGRIndexError', 'SpatialReference', 'SRSException',
-    'check_err', 'gdal_version', 'gdal_full_version',
+    'GDALRaster', 'GDAL_VERSION', 'OGRGeometry', 'OGRGeomType',
+    'OGRIndexError', 'SpatialReference', 'SRSException', 'check_err',
+    'gdal_version', 'gdal_full_version',
 )
diff --git a/django/contrib/gis/gdal/error.py b/django/contrib/gis/gdal/error.py
index a6ac98a306..5c29c7c849 100644
--- a/django/contrib/gis/gdal/error.py
+++ b/django/contrib/gis/gdal/error.py
@@ -10,10 +10,6 @@ class GDALException(Exception):
     pass
 
 
-# Legacy name
-OGRException = GDALException
-
-
 class SRSException(Exception):
     pass
 
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index cb07413c75..423f390433 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -588,6 +588,9 @@ Miscellaneous
   the relative order of elements in each list <form-media-asset-order>`.
   ``MediaOrderConflictWarning`` is issued if the order can't be preserved.
 
+* ``django.contrib.gis.gdal.OGRException`` is removed. It's been an alias for
+  ``GDALException`` since Django 1.8.
+
 .. _deprecated-features-2.0:
 
 Features deprecated in 2.0