fix-precommit-ci attempt 1

Author: DhruvaSambrani

khal/khalendar/event.py

@@ -25,7 +25,7 @@
 import datetime as dt
 import logging
 import os
-from typing import Callable, Optional, Union
+from typing import Any, Callable, Optional, Union
 
 import icalendar
 import icalendar.cal
@@ -603,7 +603,7 @@ def attributes(
         """
         env = env or {}
 
-        attributes = {}
+        attributes: dict[str, Any] = {}
         if isinstance(relative_to, tuple):
             relative_to_start, relative_to_end = relative_to
         else:

khal/utils.py

@@ -199,7 +199,8 @@ def fmt(rows):
 
             if 'alarms-list' in row and isinstance(row['alarms-list'], list):
                 row['alarms-list'] = ", ".join(
-                    alarm['description']+"@"+alarm['delta-formatted'] for alarm in row['alarms-list']
+                    alarm['description']+"@"+alarm['delta-formatted']
+                    for alarm in row['alarms-list']
                 )
 
             s = format_string.format(**row)

tests/cli_test.py

@@ -495,7 +495,10 @@ def test_list_alarms_json(runner):
         f"new {now} 18:00 myevent --alarms 15m,1h".split())
     args = ['list', '--json', 'alarms-list']
     result = runner.invoke(main_khal, args)
-    expected = '[{"alarms-list": [{"delta": -900.0, "description": "", "delta-formatted": "-15m"}, {"delta": -3600.0, "description": "", "delta-formatted": "-1h"}]}]'
+    expected = '[{"alarms-list": [\
+    {"delta": -900.0, "description": "", "delta-formatted": "-15m"},\
+    {"delta": -3600.0, "description": "", "delta-formatted": "-1h"}\
+    ]}]'
     assert not result.exception
     assert result.output.startswith(expected)