Fixed code formatting and add a news fragment for PR 2009

Author: Gedlex

can/io/asc.py

@@ -141,7 +141,7 @@ def _datetime_to_timestamp(datetime_string: str) -> float:
             "%m %d %H:%M:%S.%f %Y",
             "%m %d %H:%M:%S %Y",
             "%m %d %H:%M:%S.%f %p %Y",
-            "%m %d %H:%M:%S %p %Y"
+            "%m %d %H:%M:%S %p %Y",
         )
 
         datetime_string_parts = datetime_string.split(" ", 1)
@@ -153,7 +153,6 @@ def _datetime_to_timestamp(datetime_string: str) -> float:
             raise ValueError(f"Unsupported month abbreviation: {month}") from None
         datetime_string = " ".join(datetime_string_parts)
 
-
         for format_str in DATETIME_FORMATS:
             try:
                 return datetime.strptime(datetime_string, format_str).timestamp()

doc/changelog.d/2009.changed.md

@@ -0,0 +1 @@
+Improved datetime parsing and added support for “double-defined” datetime strings (such as, e.g., `"30 15:06:13.191 pm 2017"`) for ASCReader class.

test/logformats_test.py

@@ -680,6 +680,19 @@ def test_write(self):
 
         self.assertEqual(expected_file.read_text(), actual_file.read_text())
 
+    @parameterized.expand(
+        [
+            ("May 27 04:09:35.000 pm 2014", 1401199775.0),
+            ("Mai 27 04:09:35.000 pm 2014", 1401199775.0),
+            ("Apr 28 10:44:52.480 2022", 1651135492.48),
+            ("Sep 30 15:06:13.191 2017", 1506776773.191),
+            ("Sep 30 15:06:13.191 pm 2017", 1506776773.191),
+            ("Sep 30 15:06:13.191 am 2017", 1506776773.191),
+        ]
+    )
+    def test_datetime_to_timestamp(self, datetime_string: str, expected_timestamp: float):
+        timestamp = can.ASCReader._datetime_to_timestamp(datetime_string)
+        self.assertAlmostEqual(timestamp, expected_timestamp)
 
 class TestBlfFileFormat(ReaderWriterTest):
     """Tests can.BLFWriter and can.BLFReader.