mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 06:36:07 +00:00
Code Issues 32 Releases Wiki Activity

Improved messages in IndexErrors raised by GDAL objects.

Browse Source
This commit is contained in:
Nick Pope
2017-09-02 08:38:17 +01:00
committed by Tim Graham
parent 0d9e1163e8
commit 66657eb01f
5 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,12 +89,12 @@ class DataSource(GDALBase):
if isinstance(index, str):
layer = capi.get_layer_by_name(self.ptr, force_bytes(index))
if not layer:
raise IndexError('invalid OGR Layer name given: "%s"' % index)
raise IndexError('Invalid OGR layer name given: %s.' % index)
elif isinstance(index, int):
if 0 <= index < self.layer_count:
layer = capi.get_layer(self._ptr, index)
else:
raise IndexError('index out of range')
raise IndexError('Index out of range when accessing layers in a datasource: %s.' % index)
else:
raise TypeError('Invalid index type: %s' % type(index))
return Layer(layer, self)

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

@@ -38,7 +38,7 @@ class Feature(GDALBase):
elif 0 <= index < self.num_fields:
i = index
else:
raise IndexError('index out of range')
raise IndexError('Index out of range when accessing field in a feature: %s.' % index)
return Field(self, i)
def __len__(self):
@@ -111,5 +111,5 @@ class Feature(GDALBase):
"Return the index of the given field name."
i = capi.get_field_index(self.ptr, force_bytes(field_name))
if i < 0:
raise IndexError('invalid OFT field name given: "%s"' % field_name)
raise IndexError('Invalid OFT field name given: %s.' % field_name)
return i

6
django/contrib/gis/gdal/geometries.py
View File

@@ -564,7 +564,7 @@ class LineString(OGRGeometry):
elif dim == 3:
return (x.value, y.value, z.value)
else:
raise IndexError('index out of range: %s' % index)
raise IndexError('Index out of range when accessing points of a line string: %s.' % index)
def __len__(self):
"Return the number of points in the LineString."
@@ -616,7 +616,7 @@ class Polygon(OGRGeometry):
if 0 <= index < self.geom_count:
return OGRGeometry(capi.clone_geom(capi.get_geom_ref(self.ptr, index)), self.srs)
else:
raise IndexError('index out of range: %s' % index)
raise IndexError('Index out of range when accessing rings of a polygon: %s.' % index)
# Polygon Properties
@property
@@ -655,7 +655,7 @@ class GeometryCollection(OGRGeometry):
if 0 <= index < self.geom_count:
return OGRGeometry(capi.clone_geom(capi.get_geom_ref(self.ptr, index)), self.srs)
else:
raise IndexError('index out of range: %s' % index)
raise IndexError('Index out of range when accessing geometry in a collection: %s.' % index)
def __len__(self):
"Return the number of geometries in this Geometry Collection."