From 05ac5b52a224d6eddb23d748a9d8e3ee5571341b Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Thu, 5 Mar 2026 16:29:39 +0100 Subject: ExecuteSQL: Use the context manager instead of calling ReleaseResultSet() manually. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This assumes gdal ≥3.7, see https://gdal.org/en/stable/api/python/raster_api.html#osgeo.gdal.Dataset.ExecuteSQL . --- import_source.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'import_source.py') diff --git a/import_source.py b/import_source.py index 1271981..c04390e 100644 --- a/import_source.py +++ b/import_source.py @@ -984,18 +984,15 @@ def updateLayerCache(lyr : ogr.Layer, cache : ogr.Layer, struct_dgst : Final = struct.Struct('@qq').pack logging.debug('%s', query) ds = lyr.GetDataset() - lyr2 = ds.ExecuteSQL(query) - try: - assert lyr2.GetLayerDefn().GetFieldDefn(0).GetName() == 'hash_properties' - assert lyr2.GetLayerDefn().GetFieldDefn(1).GetName() == 'hash_geom' + with ds.ExecuteSQL(query) as lyr2: + defn2 = lyr2.GetLayerDefn() + assert defn2.GetFieldDefn(0).GetName() == 'hash_properties' + assert defn2.GetFieldDefn(1).GetName() == 'hash_geom' feature = lyr2.GetNextFeature() while feature is not None: dgst.update(struct_dgst(feature.GetFID(), feature.GetFieldAsInteger64(0))) dgst.update(feature.GetFieldAsBinary(1)) feature = lyr2.GetNextFeature() - finally: - ds.ReleaseResultSet(lyr2) - lyr2 = None fingerprint = dgst.digest() attributeFilter = 'layername = ' + escape_literal_str(layername) -- cgit v1.2.3