Skip to content

Commit dd5886c

Browse files
authored
Removes an unneeded line from the two scripts; Use context manager in player.py (#1099)
* Removes an unneeded line from the two scripts each Was discussed in #1072 * Tiny cleanup in plyer.py
1 parent 2043822 commit dd5886c

File tree

2 files changed

+22
-30
lines changed

2 files changed

+22
-30
lines changed

can/logger.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ def _parse_filters(parsed_args: Any) -> CanFilters:
124124

125125
def main() -> None:
126126
parser = argparse.ArgumentParser(
127-
"python -m can.logger",
128127
description="Log CAN traffic, printing messages to stdout or to a given file.",
129128
)
130129

can/player.py

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313

1414
from can import LogReader, Message, MessageSync
1515

16-
1716
from .logger import _create_base_argument_parser, _create_bus
1817

1918

2019
def main() -> None:
21-
parser = argparse.ArgumentParser(
22-
"python -m can.player", description="Replay CAN traffic."
23-
)
20+
parser = argparse.ArgumentParser(description="Replay CAN traffic.")
2421

2522
_create_base_argument_parser(parser)
2623

@@ -87,31 +84,27 @@ def main() -> None:
8784

8885
error_frames = results.error_frames
8986

90-
bus = _create_bus(results)
91-
92-
reader = LogReader(results.infile)
93-
94-
in_sync = MessageSync(
95-
cast(Iterable[Message], reader),
96-
timestamps=results.timestamps,
97-
gap=results.gap,
98-
skip=results.skip,
99-
)
100-
101-
print(f"Can LogReader (Started on {datetime.now()})")
102-
103-
try:
104-
for m in in_sync:
105-
if m.is_error_frame and not error_frames:
106-
continue
107-
if verbosity >= 3:
108-
print(m)
109-
bus.send(m)
110-
except KeyboardInterrupt:
111-
pass
112-
finally:
113-
bus.shutdown()
114-
reader.stop()
87+
with _create_bus(results) as bus:
88+
with LogReader(results.infile) as reader:
89+
90+
in_sync = MessageSync(
91+
cast(Iterable[Message], reader),
92+
timestamps=results.timestamps,
93+
gap=results.gap,
94+
skip=results.skip,
95+
)
96+
97+
print(f"Can LogReader (Started on {datetime.now()})")
98+
99+
try:
100+
for message in in_sync:
101+
if message.is_error_frame and not error_frames:
102+
continue
103+
if verbosity >= 3:
104+
print(message)
105+
bus.send(message)
106+
except KeyboardInterrupt:
107+
pass
115108

116109

117110
if __name__ == "__main__":

0 commit comments

Comments
 (0)