remove import logic for motorlimitserror

Author: rerpha

src/ibex_bluesky_core/devices/block.py

@@ -484,7 +484,7 @@ def set(  # pyright: ignore
         This is needed so that type-checker correctly understands the type of set.
 
         This method will raise
-        :external+ophyd_async:py:obj:`ophyd_async.epics.motor.MotorLimitsException`
+        :external+ophyd_async:py:obj:`ophyd_async.epics.motor.MotorLimitsError`
         if the requested position was outside the motor's limits.
         """
         return super().set(value, timeout)

tests/devices/test_block.py

@@ -4,9 +4,9 @@
 
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
-import ophyd_async
 import pytest
 from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.epics.motor import MotorLimitsError
 
 from ibex_bluesky_core.devices.block import (
     GLOBAL_MOVING_FLAG_PRE_WAIT,
@@ -353,23 +353,13 @@ async def test_block_mot_set_within_limits(mot_block):
 
 
 async def test_block_mot_set_outside_limits(mot_block):
-    # Local import as API not available in older ophyd_async versions
-    if ophyd_async._version.version_tuple >= (0, 13, 5):
-        from ophyd_async.epics.motor import MotorLimitsError  # pyright: ignore # noqa PLC0415
-
-        err = MotorLimitsError
-    else:
-        from ophyd_async.epics.motor import MotorLimitsException  # pyright: ignore # noqa PLC0415
-
-        err = MotorLimitsException
-
     set_mock_value(mot_block.user_setpoint, 10)
     set_mock_value(mot_block.velocity, 10)
     set_mock_value(mot_block.dial_high_limit_travel, 15)
     set_mock_value(mot_block.dial_low_limit_travel, 5)
     set_mock_value(mot_block.high_limit_travel, 15)
     set_mock_value(mot_block.low_limit_travel, 5)
-    with pytest.raises(err):
+    with pytest.raises(MotorLimitsError):
         await mot_block.set(20)