Use ValueError rather than plain Exception

gribapi/gribapi.py

@@ -308,7 +308,7 @@ def codes_new_from_file(fileobj, product_kind, headers_only=False):
         return gts_new_from_file(fileobj, headers_only)
     if product_kind == CODES_PRODUCT_ANY:
         return any_new_from_file(fileobj, headers_only)
-    raise Exception("Invalid product kind: " + str(product_kind))
+    raise ValueError("Invalid product kind %d" % product_kind)
 
 
 @require(fileobj=file)
@@ -1031,7 +1031,7 @@ def codes_new_from_samples(samplename, product_kind):
         return grib_new_from_samples(samplename)
     if product_kind == CODES_PRODUCT_BUFR:
         return codes_bufr_new_from_samples(samplename)
-    raise Exception("Invalid product kind: " + str(product_kind))
+    raise ValueError("Invalid product kind %d" % product_kind)
 
 
 @require(samplename=str)

tests/test_eccodes.py

@@ -80,7 +80,7 @@ def test_new_from_file():
     with open(fpath, "rb") as f:
         msgid = codes_new_from_file(f, CODES_PRODUCT_METAR)
         assert msgid is None
-    with pytest.raises(Exception):
+    with pytest.raises(ValueError):
         with open(fpath, "rb") as f:
             codes_new_from_file(f, 1024)
 
@@ -581,7 +581,7 @@ def test_bufr_multi_element_constant_arrays():
 def test_bufr_new_from_samples_error():
     with pytest.raises(FileNotFoundError):
         gid = codes_new_from_samples("nonExistentSample", CODES_PRODUCT_BUFR)
-    with pytest.raises(Exception):
+    with pytest.raises(ValueError):
         codes_new_from_samples("BUFR3_local", 1024)