Change order for is_dataclass check to aid mypy 1.11

This allows the type ignore to be removed.
lsst · Jul 23, 2024 · b731584 · b731584
1 parent b21c22d
commit b731584
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/python/lsst/daf/butler/formatters/json.py b/python/lsst/daf/butler/formatters/json.py
@@ -93,8 +93,9 @@ def to_bytes(self, in_memory_dataset: Any) -> bytes:
         with contextlib.suppress(AttributeError):
             return in_memory_dataset.json().encode()
 
-        if dataclasses.is_dataclass(in_memory_dataset) and not isinstance(in_memory_dataset, type):
-            in_memory_dataset = dataclasses.asdict(in_memory_dataset)  # type: ignore
+        # The initial check this is not a type is to help mypy.
+        if not isinstance(in_memory_dataset, type) and dataclasses.is_dataclass(in_memory_dataset):
+            in_memory_dataset = dataclasses.asdict(in_memory_dataset)
         elif hasattr(in_memory_dataset, "_asdict"):
             in_memory_dataset = in_memory_dataset._asdict()
         return json.dumps(in_memory_dataset, ensure_ascii=False).encode()
diff --git a/python/lsst/daf/butler/formatters/yaml.py b/python/lsst/daf/butler/formatters/yaml.py
@@ -98,8 +98,9 @@ def to_bytes(self, in_memory_dataset: Any) -> bytes:
                 converted = True
 
         if not converted:
-            if dataclasses.is_dataclass(in_memory_dataset) and not isinstance(in_memory_dataset, type):
-                in_memory_dataset = dataclasses.asdict(in_memory_dataset)  # type: ignore
+            # The initial check this is not a type is to help mypy.
+            if not isinstance(in_memory_dataset, type) and dataclasses.is_dataclass(in_memory_dataset):
+                in_memory_dataset = dataclasses.asdict(in_memory_dataset)
             elif hasattr(in_memory_dataset, "_asdict"):
                 in_memory_dataset = in_memory_dataset._asdict()