Skip to content

Commit 5859cdc

Browse files
authored
Merge pull request hardbyte#1034 from cperkulator/develop
Catch time before 1970 in ASCReader
2 parents 893235e + 048c3f0 commit 5859cdc

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

can/io/asc.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,17 @@ def _extract_header(self):
8585
continue
8686
# grab absolute timestamp
8787
elif lower_case.startswith("begin triggerblock"):
88-
try:
89-
_, _, start_time = lower_case.split(None, 2)
90-
start_time = datetime.strptime(
91-
start_time, self.FORMAT_START_OF_FILE_DATE
92-
).timestamp()
93-
except ValueError:
94-
start_time = 0.0
9588
if self.relative_timestamp:
9689
self.start_time = 0.0
9790
else:
91+
try:
92+
_, _, start_time = lower_case.split(None, 2)
93+
start_time = datetime.strptime(
94+
start_time, self.FORMAT_START_OF_FILE_DATE
95+
).timestamp()
96+
except (ValueError, OSError):
97+
# `OSError` to handle non-POSIX capable timestamps
98+
start_time = 0.0
9899
self.start_time = start_time
99100
# Currently the last line in the header which is parsed
100101
break

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ deps =
1111
pyserial~=3.0
1212

1313
commands =
14-
pytest
14+
pytest {posargs}
1515

1616
recreate = True
1717

0 commit comments

Comments
 (0)