Raise the correct exceptions

ecmwf · Dec 15, 2023 · 2f48b83 · 2f48b83
1 parent 5b3367e
commit 2f48b83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gribapi/errors.py b/gribapi/errors.py
@@ -192,7 +192,7 @@ class InvalidIndexError(GribInternalError):
 
 
 class InvalidGribError(GribInternalError):
-    """Invalid grib id."""
+    """Invalid GRIB id."""
 
 
 class InvalidFileError(GribInternalError):

diff --git a/gribapi/gribapi.py b/gribapi/gribapi.py
@@ -162,13 +162,13 @@ def wrapper(*args):
 def get_handle(msgid):
     h = ffi.cast("grib_handle*", msgid)
     if h == ffi.NULL:
-        raise errors.InvalidGribError(f"get_handle: Bad message ID {msgid}")
+        raise errors.NullHandleError(f"get_handle: Bad message ID {msgid}")
     return h
 
 
 def put_handle(handle):
     if handle == ffi.NULL:
-        raise errors.InvalidGribError(f"put_handle: Bad message ID {handle}")
+        raise errors.NullHandleError(f"put_handle: Bad message ID {handle}")
     return int(ffi.cast("size_t", handle))
 
 
@@ -1137,7 +1137,7 @@ def grib_clone(msgid_src):
     h_src = get_handle(msgid_src)
     h_dest = lib.grib_handle_clone(h_src)
     if h_dest == ffi.NULL:
-        raise errors.InvalidGribError("clone failed")
+        raise errors.MessageInvalidError("clone failed")
     return put_handle(h_dest)
 
 
@@ -2381,7 +2381,7 @@ def grib_new_from_message(message):
         message = message.encode(ENC)
     h = lib.grib_handle_new_from_message_copy(ffi.NULL, message, len(message))
     if h == ffi.NULL:
-        raise errors.InvalidGribError("new_from_message failed")
+        raise errors.MessageInvalidError("new_from_message failed")
     return put_handle(h)
 
 

diff --git a/tests/test_eccodes.py b/tests/test_eccodes.py
@@ -84,8 +84,8 @@ def test_codes_get_native_type():
     assert eccodes.codes_get_native_type(gid, "referenceValue") is float
     assert eccodes.codes_get_native_type(gid, "stepType") is str
     assert eccodes.codes_get_native_type(gid, "section_1") is None
-    with pytest.raises(eccodes.InvalidGribError):
-        eccodes.codes_get_native_type(0, "aKey")
+    with pytest.raises(eccodes.NullHandleError):
+        eccodes.codes_get_native_type(0, "aKey")  # NULL handle
 
 
 def test_new_from_file():