mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #28569 -- Corrected get_layer_by_name prototype to skip error checking.

Browse Source 
All other get_*_by_name functions have errcheck=False. This makes it
return None for an invalid name instead of raising a GDALException.
This commit is contained in:
Nick Pope 2017-09-03 23:00:07 +01:00 committed by Tim Graham
parent c9b22707b0
commit 0d9e1163e8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/gdal/prototypes/ds.py
View File

@ -28,7 +28,7 @@ destroy_ds = void_output(lgdal.OGR_DS_Destroy, [c_void_p], errcheck=False)
release_ds = void_output(lgdal.OGRReleaseDataSource, [c_void_p]) release_ds = void_output(lgdal.OGRReleaseDataSource, [c_void_p])
get_ds_name = const_string_output(lgdal.OGR_DS_GetName, [c_void_p]) get_ds_name = const_string_output(lgdal.OGR_DS_GetName, [c_void_p])
get_layer = voidptr_output(lgdal.OGR_DS_GetLayer, [c_void_p, c_int]) get_layer = voidptr_output(lgdal.OGR_DS_GetLayer, [c_void_p, c_int])
get_layer_by_name = voidptr_output(lgdal.OGR_DS_GetLayerByName, [c_void_p, c_char_p]) get_layer_by_name = voidptr_output(lgdal.OGR_DS_GetLayerByName, [c_void_p, c_char_p], errcheck=False)
get_layer_count = int_output(lgdal.OGR_DS_GetLayerCount, [c_void_p]) get_layer_count = int_output(lgdal.OGR_DS_GetLayerCount, [c_void_p])
# Layer Routines # Layer Routines

3
tests/gis_tests/gdal_tests/test_ds.py
View File

@ -86,6 +86,9 @@ class DataSourceTest(unittest.TestCase):
with self.assertRaises(IndexError): with self.assertRaises(IndexError):
ds[len(ds)] ds[len(ds)]
with self.assertRaises(IndexError):
ds['invalid']
def test02_invalid_shp(self): def test02_invalid_shp(self):
"Testing invalid SHP files for the Data Source." "Testing invalid SHP files for the Data Source."
for source in bad_ds: for source in bad_ds: