make_dsid -> make_dataid

Rename make_dataid based on the finally merged version of the PR.

Author: gerritholl

tests/test_show_fog.py

@@ -29,19 +29,11 @@ def test_main(fvg, fpsp, tmp_path, xrda):
     m_im = MagicMock()
     m_sc = MagicMock()
     f_sc = Scene()
-    try:
-        from satpy.tests.utils import make_dsid
-    except ImportError:
-        from satpy import DatasetID
-        f_sc[DatasetID("raspberry")] = xrda[0]
-        f_sc[DatasetID("banana")] = xrda[1]
-        f_sc[DatasetID("fls_day_extra")] = xarray.Dataset(
-                {"a": xrda[0], "b": xrda[1]})
-    else:
-        f_sc[make_dsid(name="raspberry")] = xrda[0]
-        f_sc[make_dsid(name="banana")] = xrda[1]
-        f_sc[make_dsid(name="fls_day_extra")] = xarray.Dataset(
-                {"a": xrda[0], "b": xrda[1]})
+    from satpy.tests.utils import make_dataid
+    f_sc[make_dataid(name="raspberry")] = xrda[0]
+    f_sc[make_dataid(name="banana")] = xrda[1]
+    f_sc[make_dataid(name="fls_day_extra")] = xarray.Dataset(
+            {"a": xrda[0], "b": xrda[1]})
     m_sc.__getitem__.side_effect = f_sc.__getitem__
     m_sc.keys.side_effect = f_sc.keys
     fvg.return_value = (m_im, m_sc)