6
6
"""
7
7
8
8
import abc
9
+ import heapq
9
10
import logging
10
11
from datetime import datetime
11
12
from hashlib import md5
@@ -292,8 +293,6 @@ def __init__(self, mdf: MDF4, group_index: int, start_timestamp: float, name: st
292
293
if str (channel .name ).startswith (f"{ self ._name } ." ):
293
294
self ._channel_names .append (channel .name )
294
295
295
- return
296
-
297
296
def _get_data (self , current_offset : int ) -> Signal :
298
297
# NOTE: asammdf suggests using select instead of get. Select seem to miss converting some
299
298
# channels which get does convert as expected.
@@ -311,8 +310,6 @@ def _get_data(self, current_offset: int) -> Signal:
311
310
def __iter__ (self ) -> Generator [Message , None , None ]:
312
311
pass
313
312
314
- pass
315
-
316
313
317
314
class MF4Reader (BinaryIOMessageReader ):
318
315
"""
@@ -328,8 +325,6 @@ class _CANDataFrameIterator(FrameIterator):
328
325
def __init__ (self , mdf : MDF4 , group_index : int , start_timestamp : float ):
329
326
super ().__init__ (mdf , group_index , start_timestamp , "CAN_DataFrame" )
330
327
331
- return
332
-
333
328
def __iter__ (self ) -> Generator [Message , None , None ]:
334
329
for current_offset in range (
335
330
0 ,
@@ -365,17 +360,11 @@ def __iter__(self) -> Generator[Message, None, None]:
365
360
366
361
yield Message (** kv )
367
362
368
- return None
369
-
370
- pass
371
-
372
363
class _CANErrorFrameIterator (FrameIterator ):
373
364
374
365
def __init__ (self , mdf : MDF4 , group_index : int , start_timestamp : float ):
375
366
super ().__init__ (mdf , group_index , start_timestamp , "CAN_ErrorFrame" )
376
367
377
- return
378
-
379
368
def __iter__ (self ) -> Generator [Message , None , None ]:
380
369
for current_offset in range (
381
370
0 ,
@@ -422,17 +411,11 @@ def __iter__(self) -> Generator[Message, None, None]:
422
411
423
412
yield Message (** kv )
424
413
425
- return None
426
-
427
- pass
428
-
429
414
class _CANRemoteFrameIterator (FrameIterator ):
430
415
431
416
def __init__ (self , mdf : MDF4 , group_index : int , start_timestamp : float ):
432
417
super ().__init__ (mdf , group_index , start_timestamp , "CAN_RemoteFrame" )
433
418
434
- return
435
-
436
419
def __iter__ (self ) -> Generator [Message , None , None ]:
437
420
for current_offset in range (
438
421
0 ,
@@ -460,10 +443,6 @@ def __iter__(self) -> Generator[Message, None, None]:
460
443
461
444
yield Message (** kv )
462
445
463
- return None
464
-
465
- pass
466
-
467
446
def __init__ (
468
447
self ,
469
448
file : Union [StringPathLike , BinaryIO ],
@@ -491,8 +470,6 @@ def __init__(
491
470
self ._start_timestamp = self ._mdf .header .start_time .timestamp ()
492
471
493
472
def __iter__ (self ) -> Iterator [Message ]:
494
- import heapq
495
-
496
473
# To handle messages split over multiple channel groups, create a single iterator per
497
474
# channel group and merge these iterators into a single iterator using heapq.
498
475
iterators : List [FrameIterator ] = []
@@ -512,7 +489,7 @@ def __iter__(self) -> Iterator[Message]:
512
489
if acquisition_source is None :
513
490
# No source information, skip
514
491
continue
515
- elif not acquisition_source .source_type & Source .SOURCE_BUS :
492
+ if not acquisition_source .source_type & Source .SOURCE_BUS :
516
493
# Not a bus type (likely already covered by the channel group flag), skip
517
494
continue
518
495
0 commit comments