Skip to content

Commit 93ef698

Browse files
committed
fix ixxat imports
1 parent e673ec4 commit 93ef698

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

can/interfaces/ixxat/canlib.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
from typing import Callable, Optional, Sequence, Union
22

3-
import can
43
import can.interfaces.ixxat.canlib_vcinpl as vcinpl
54
import can.interfaces.ixxat.canlib_vcinpl2 as vcinpl2
6-
from can import BusABC, Message
7-
from can.bus import BusState
5+
from can import (
6+
BusABC,
7+
BusState,
8+
CyclicSendTaskABC,
9+
Message,
10+
)
811

912

1013
class IXXATBus(BusABC):
@@ -152,7 +155,7 @@ def _send_periodic_internal(
152155
period: float,
153156
duration: Optional[float] = None,
154157
modifier_callback: Optional[Callable[[Message], None]] = None,
155-
) -> can.broadcastmanager.CyclicSendTaskABC:
158+
) -> CyclicSendTaskABC:
156159
return self.bus._send_periodic_internal(
157160
msgs, period, duration, modifier_callback
158161
)

can/interfaces/ixxat/canlib_vcinpl.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
import warnings
1717
from typing import Callable, Optional, Sequence, Tuple, Union
1818

19-
import can
20-
from can import BusABC, CanProtocol, Message
21-
from can.broadcastmanager import (
19+
from can import (
20+
BusABC,
21+
BusState,
22+
CanProtocol,
23+
CyclicSendTaskABC,
2224
LimitedDurationCyclicSendTaskABC,
25+
Message,
2326
RestartableCyclicTaskABC,
2427
)
25-
from can.bus import BusState
2628
from can.ctypesutil import HANDLE, PHANDLE, CLibrary
2729
from can.ctypesutil import HRESULT as ctypes_HRESULT
2830
from can.exceptions import CanInitializationError, CanInterfaceNotImplementedError
@@ -793,7 +795,7 @@ def _send_periodic_internal(
793795
period: float,
794796
duration: Optional[float] = None,
795797
modifier_callback: Optional[Callable[[Message], None]] = None,
796-
) -> can.broadcastmanager.CyclicSendTaskABC:
798+
) -> CyclicSendTaskABC:
797799
"""Send a message using built-in cyclic transmit list functionality."""
798800
if modifier_callback is None:
799801
if self._scheduler is None:

can/interfaces/ixxat/canlib_vcinpl2.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616
import warnings
1717
from typing import Callable, Optional, Sequence, Tuple, Union
1818

19-
from can import BusABC, CanProtocol, Message
20-
from can.broadcastmanager import (
19+
from can import (
20+
BusABC,
21+
CanProtocol,
22+
CyclicSendTaskABC,
2123
LimitedDurationCyclicSendTaskABC,
24+
Message,
2225
RestartableCyclicTaskABC,
2326
)
2427
from can.ctypesutil import HANDLE, PHANDLE, CLibrary
@@ -938,7 +941,7 @@ def _send_periodic_internal(
938941
period: float,
939942
duration: Optional[float] = None,
940943
modifier_callback: Optional[Callable[[Message], None]] = None,
941-
) -> can.broadcastmanager.CyclicSendTaskABC:
944+
) -> CyclicSendTaskABC:
942945
"""Send a message using built-in cyclic transmit list functionality."""
943946
if modifier_callback is None:
944947
if self._scheduler is None:

0 commit comments

Comments
 (0)