diff --git a/adafruit_motor/motor.py b/adafruit_motor/motor.py index 7086bb6..e77f40d 100644 --- a/adafruit_motor/motor.py +++ b/adafruit_motor/motor.py @@ -26,7 +26,12 @@ try: from pwmio import PWMOut - except NotImplementedError: + except (ImportError, RuntimeError) as exc: + # Blinka wraps a missing platform library in RuntimeError. + if not isinstance(exc, (ImportError, NotImplementedError)) and not isinstance( + exc.__cause__, ImportError + ): + raise from circuitpython_typing.pwmio import PWMOut except ImportError: diff --git a/adafruit_motor/servo.py b/adafruit_motor/servo.py index a32ae0f..f7d044e 100644 --- a/adafruit_motor/servo.py +++ b/adafruit_motor/servo.py @@ -18,7 +18,12 @@ try: from pwmio import PWMOut - except NotImplementedError: + except (ImportError, RuntimeError) as exc: + # Blinka wraps a missing platform library in RuntimeError. + if not isinstance(exc, (ImportError, NotImplementedError)) and not isinstance( + exc.__cause__, ImportError + ): + raise from circuitpython_typing.pwmio import PWMOut except (ImportError, NotImplementedError): diff --git a/adafruit_motor/stepper.py b/adafruit_motor/stepper.py index f2c85de..4516cb3 100755 --- a/adafruit_motor/stepper.py +++ b/adafruit_motor/stepper.py @@ -21,11 +21,20 @@ try: from typing import Optional, Union - from digitalio import DigitalInOut + try: + from digitalio import DigitalInOut + except (ImportError, RuntimeError) as exc: + if not isinstance(exc, ImportError) and not isinstance(exc.__cause__, ImportError): + raise try: from pwmio import PWMOut - except NotImplementedError: + except (ImportError, RuntimeError) as exc: + # Blinka wraps a missing platform library in RuntimeError. + if not isinstance(exc, (ImportError, NotImplementedError)) and not isinstance( + exc.__cause__, ImportError + ): + raise from circuitpython_typing.pwmio import PWMOut except ImportError: @@ -92,10 +101,10 @@ class StepperMotor: def __init__( self, - ain1: Union[PWMOut, DigitalInOut], - ain2: Union[PWMOut, DigitalInOut], - bin1: Union[PWMOut, DigitalInOut], - bin2: Union[PWMOut, DigitalInOut], + ain1: Union[PWMOut, "DigitalInOut"], + ain2: Union[PWMOut, "DigitalInOut"], + bin1: Union[PWMOut, "DigitalInOut"], + bin2: Union[PWMOut, "DigitalInOut"], *, microsteps: Optional[int] = 16, ) -> None: