Merge pull request #4397 from yut23/load_hint_superclasses

yt/loaders.py

@@ -116,8 +116,12 @@ def load(
         if cls._is_valid(fn, *args, **kwargs):
             candidates.append(cls)
 
+    # Filter the candidates if a hint was given
+    if hint is not None:
+        candidates = [c for c in candidates if hint.lower() in c.__name__.lower()]
+
     # Find only the lowest subclasses, i.e. most specialised front ends
-    candidates = find_lowest_subclasses(candidates, hint=hint)
+    candidates = find_lowest_subclasses(candidates)
 
     if len(candidates) == 1:
         return candidates[0](fn, *args, **kwargs)

yt/tests/test_load_errors.py

@@ -96,6 +96,10 @@ def _set_code_unit_attributes(self, *args, **kwargs):
             self.mass_unit = self.quan(1, "kg")
             self.time_unit = self.quan(1, "s")
 
+        @classmethod
+        def _is_valid(cls, *args, **kwargs):
+            return True
+
     class AlphaDataset(MockDataset):
         @classmethod
         def _is_valid(cls, *args, **kwargs):
@@ -139,6 +143,8 @@ def test_load_ambiguous_data(tmp_path):
         ("beta", "BetaDataset"),
         ("BeTA", "BetaDataset"),
         ("b", "BetaDataset"),
+        ("mock", "MockDataset"),
+        ("MockDataset", "MockDataset"),
     ],
 )
 @pytest.mark.usefixtures("ambiguous_dataset_classes")

yt/utilities/hierarchy_inspection.py

@@ -1,12 +1,10 @@
 import inspect
 from collections import Counter
 from functools import reduce
-from typing import List, Optional, Type
+from typing import List, Type
 
 
-def find_lowest_subclasses(
-    candidates: List[Type], *, hint: Optional[str] = None
-) -> List[Type]:
+def find_lowest_subclasses(candidates: List[Type]) -> List[Type]:
     """
     This function takes a list of classes, and returns only the ones that are
     are not super classes of any others in the list. i.e. the ones that are at
@@ -18,9 +16,6 @@ def find_lowest_subclasses(
         An iterable object that is a collection of classes to find the lowest
         subclass of.
 
-    hint : str, optional
-        Only keep candidates classes that have `hint` in their name (case insensitive)
-
     Returns
     -------
     result : list
@@ -44,7 +39,4 @@ def find_lowest_subclasses(
 
     count = reduce(lambda x, y: x + y, counters)
 
-    retv = [x for x in count.keys() if count[x] == 1]
-    if hint is not None:
-        retv = [x for x in retv if hint.lower() in x.__name__.lower()]
-    return retv
+    return [x for x in count.keys() if count[x] == 1]