Make type-checking happy

DiamondLightSource · Jan 7, 2025 · 8096af2 · 8096af2
1 parent 4db1562
commit 8096af2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/dodal/common/beamlines/beamline_utils.py b/src/dodal/common/beamlines/beamline_utils.py
@@ -13,7 +13,6 @@
 from dodal.utils import (
     AnyDevice,
     BeamlinePrefix,
-    D,
     DeviceInitializationController,
     SkipType,
     skip_device,
@@ -141,8 +140,8 @@ def device_factory(
         SkipType,
         "mark the factory to be (conditionally) skipped when beamline is imported by external program",
     ] = False,
-) -> Callable[[Callable[[], D]], DeviceInitializationController[D]]:
-    def decorator(factory: Callable[[], D]) -> DeviceInitializationController[D]:
+) -> Callable[[Callable[[], T]], DeviceInitializationController[T]]:
+    def decorator(factory: Callable[[], T]) -> DeviceInitializationController[T]:
         return DeviceInitializationController(
             factory,
             use_factory_name,

diff --git a/src/dodal/utils.py b/src/dodal/utils.py
@@ -203,7 +203,7 @@ def __call__(
                 )
             else:
                 assert is_v1_device_type(type(device))
-                device.wait_for_connection(timeout=timeout)
+                device.wait_for_connection(timeout=timeout)  # type: ignore
 
         if name:
             device.set_name(name)