ValueError -> TypeError

Author: mathause

xarray/core/merge.py

@@ -536,7 +536,7 @@ def merge(objects, compat='no_conflicts', join='outer', fill_value=dtypes.NA):
     dict_like_objects = list()
     for obj in objects:
         if not (isinstance(obj, (DataArray, Dataset, dict))):
-            raise ValueError("'objects' must be an iterable containing only "
+            raise TypeError("objects must be an iterable containing only "
                              "Dataset(s), DataArray(s), and dictionaries.")
 
         obj = obj.to_dataset() if isinstance(obj, DataArray) else obj

xarray/tests/test_merge.py

@@ -68,12 +68,12 @@ def test_merge_alignment_error(self):
             xr.merge([ds, other], join='exact')
 
     def test_merge_wrong_input_error(self):
-        with raises_regex(ValueError, "'objects' must be an iterable"):
+        with raises_regex(TypeError, "objects must be an iterable"):
             xr.merge([1])
         ds = xr.Dataset(coords={'x': [1, 2]})
-        with raises_regex(ValueError, "'objects' must be an iterable"):
+        with raises_regex(TypeError, "objects must be an iterable"):
             xr.merge({'a': ds})
-        with raises_regex(ValueError, "'objects' must be an iterable"):
+        with raises_regex(TypeError, "objects must be an iterable"):
             xr.merge([ds, 1])
 
     def test_merge_no_conflicts_single_var(self):