innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #28559 -- Removed contrib.gis.gdal.OGRException backwards compatibility alias.

This commit is contained in:
Nick Pope 2017-09-02 13:52:01 +01:00 committed by Tim Graham
parent 18dd9ba481
commit f9c2fd30be
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/gis/gdal/__init__.py
View File

@ -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.driver import Driver
from django.contrib.gis.gdal.envelope import Envelope from django.contrib.gis.gdal.envelope import Envelope
from django.contrib.gis.gdal.error import ( 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.geometries import OGRGeometry
from django.contrib.gis.gdal.geomtype import OGRGeomType from django.contrib.gis.gdal.geomtype import OGRGeomType
@ -41,7 +41,7 @@ from django.contrib.gis.gdal.srs import CoordTransform, SpatialReference
__all__ = ( __all__ = (
'Driver', 'DataSource', 'CoordTransform', 'Envelope', 'GDALException', 'Driver', 'DataSource', 'CoordTransform', 'Envelope', 'GDALException',
'GDALRaster', 'GDAL_VERSION', 'OGRException', 'OGRGeometry', 'OGRGeomType', 'GDALRaster', 'GDAL_VERSION', 'OGRGeometry', 'OGRGeomType',
'OGRIndexError', 'SpatialReference', 'SRSException', 'OGRIndexError', 'SpatialReference', 'SRSException', 'check_err',
'check_err', 'gdal_version', 'gdal_full_version', 'gdal_version', 'gdal_full_version',
) )

4
django/contrib/gis/gdal/error.py
View File

@ -10,10 +10,6 @@ class GDALException(Exception):
pass pass
# Legacy name
OGRException = GDALException
class SRSException(Exception): class SRSException(Exception):
pass pass

3
docs/releases/2.0.txt
View File

@ -588,6 +588,9 @@ Miscellaneous
the relative order of elements in each list <form-media-asset-order>`. the relative order of elements in each list <form-media-asset-order>`.
``MediaOrderConflictWarning`` is issued if the order can't be preserved. ``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: .. _deprecated-features-2.0:
Features deprecated in 2.0 Features deprecated in 2.0