Skip to content

Commit 9309721

Browse files
committed
Fix return value of iterator functions
1 parent 0a02d7d commit 9309721

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

gribapi/gribapi.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -752,12 +752,10 @@ def grib_iterator_next(iterid):
752752
lat_p = ffi.new("double*")
753753
lon_p = ffi.new("double*")
754754
value_p = ffi.new("double*")
755-
err = lib.grib_iterator_next(iterh, lat_p, lon_p, value_p)
756-
if err == 0:
755+
retval = lib.grib_iterator_next(iterh, lat_p, lon_p, value_p)
756+
if retval == 0:
757+
# No more data available. End of iteration
757758
return []
758-
elif err < 0:
759-
GRIB_CHECK(err)
760-
return None
761759
else:
762760
return (lat_p[0], lon_p[0], value_p[0])
763761

@@ -803,8 +801,7 @@ def grib_keys_iterator_next(iterid):
803801
"""
804802
kih = get_grib_keys_iterator(iterid)
805803
res = lib.grib_keys_iterator_next(kih)
806-
if res < 0:
807-
GRIB_CHECK(res)
804+
# res is 0 or 1
808805
return res
809806

810807

@@ -887,8 +884,7 @@ def codes_bufr_keys_iterator_next(iterid):
887884
"""
888885
bki = get_bufr_keys_iterator(iterid)
889886
res = lib.codes_bufr_keys_iterator_next(bki)
890-
if res < 0:
891-
GRIB_CHECK(res)
887+
# res is 0 or 1
892888
return res
893889

894890

0 commit comments

Comments
 (0)