Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion adafruit_motor/motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion adafruit_motor/servo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
21 changes: 15 additions & 6 deletions adafruit_motor/stepper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading