Skip to content

Commit 56dd882

Browse files
committed
Pylint fixes
1 parent 240ad2d commit 56dd882

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

can/io/mf4.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"""
77

88
import abc
9+
import heapq
910
import logging
1011
from datetime import datetime
1112
from hashlib import md5
@@ -292,8 +293,6 @@ def __init__(self, mdf: MDF4, group_index: int, start_timestamp: float, name: st
292293
if str(channel.name).startswith(f"{self._name}."):
293294
self._channel_names.append(channel.name)
294295

295-
return
296-
297296
def _get_data(self, current_offset: int) -> Signal:
298297
# NOTE: asammdf suggests using select instead of get. Select seem to miss converting some
299298
# channels which get does convert as expected.
@@ -311,8 +310,6 @@ def _get_data(self, current_offset: int) -> Signal:
311310
def __iter__(self) -> Generator[Message, None, None]:
312311
pass
313312

314-
pass
315-
316313

317314
class MF4Reader(BinaryIOMessageReader):
318315
"""
@@ -328,8 +325,6 @@ class _CANDataFrameIterator(FrameIterator):
328325
def __init__(self, mdf: MDF4, group_index: int, start_timestamp: float):
329326
super().__init__(mdf, group_index, start_timestamp, "CAN_DataFrame")
330327

331-
return
332-
333328
def __iter__(self) -> Generator[Message, None, None]:
334329
for current_offset in range(
335330
0,
@@ -365,17 +360,11 @@ def __iter__(self) -> Generator[Message, None, None]:
365360

366361
yield Message(**kv)
367362

368-
return None
369-
370-
pass
371-
372363
class _CANErrorFrameIterator(FrameIterator):
373364

374365
def __init__(self, mdf: MDF4, group_index: int, start_timestamp: float):
375366
super().__init__(mdf, group_index, start_timestamp, "CAN_ErrorFrame")
376367

377-
return
378-
379368
def __iter__(self) -> Generator[Message, None, None]:
380369
for current_offset in range(
381370
0,
@@ -422,17 +411,11 @@ def __iter__(self) -> Generator[Message, None, None]:
422411

423412
yield Message(**kv)
424413

425-
return None
426-
427-
pass
428-
429414
class _CANRemoteFrameIterator(FrameIterator):
430415

431416
def __init__(self, mdf: MDF4, group_index: int, start_timestamp: float):
432417
super().__init__(mdf, group_index, start_timestamp, "CAN_RemoteFrame")
433418

434-
return
435-
436419
def __iter__(self) -> Generator[Message, None, None]:
437420
for current_offset in range(
438421
0,
@@ -460,10 +443,6 @@ def __iter__(self) -> Generator[Message, None, None]:
460443

461444
yield Message(**kv)
462445

463-
return None
464-
465-
pass
466-
467446
def __init__(
468447
self,
469448
file: Union[StringPathLike, BinaryIO],
@@ -491,8 +470,6 @@ def __init__(
491470
self._start_timestamp = self._mdf.header.start_time.timestamp()
492471

493472
def __iter__(self) -> Iterator[Message]:
494-
import heapq
495-
496473
# To handle messages split over multiple channel groups, create a single iterator per
497474
# channel group and merge these iterators into a single iterator using heapq.
498475
iterators: List[FrameIterator] = []
@@ -512,7 +489,7 @@ def __iter__(self) -> Iterator[Message]:
512489
if acquisition_source is None:
513490
# No source information, skip
514491
continue
515-
elif not acquisition_source.source_type & Source.SOURCE_BUS:
492+
if not acquisition_source.source_type & Source.SOURCE_BUS:
516493
# Not a bus type (likely already covered by the channel group flag), skip
517494
continue
518495

0 commit comments

Comments
 (0)