Add support for icalendar 7.0.0

The following two changes are undocumented in the 7.0.0 release:

- Contentlines moved to another module.
- Exception raised is now a subclass of ValueError

The following is in the changelog:

- vcard['N'] now returns structured type vN.

Author: WhyNotHugo

CHANGELOG.rst

@@ -14,6 +14,7 @@ unreleased
 * CHANGE the ``pkg_resources`` library is no longer required.
 * FIX the location of caching database to ``$XDG_CACHE_HOME``
 * FIX color of eventcolumn when editing events in ikhal
+* FIX added support for ``icalendar>=7.0.0``.
 
 0.13.0
 ======

khal/khalendar/backend.py

@@ -298,8 +298,12 @@ def update_vcf_dates(self, vevent_str: str, href: str, etag: str='',
                 if 'FN' in vcard:
                     name = vcard['FN']
                 else:
-                    n = vcard['N'].split(';')
-                    name = ' '.join([n[1], n[2], n[0]])
+                    vn = vcard['N']
+                    if isinstance (vn, str): # icalendar < 7.0.0
+                        n = vn.split(';')
+                        name = ' '.join([n[1], n[2], n[0]])
+                    else:
+                        name = f'{vn.fields.given} {vn.fields.additional} {vn.fields.family}'
                 vevent = icalendar.Event()
                 vevent.add('dtstart', date)
                 vevent.add('dtend', date + dt.timedelta(days=1))

pyproject.toml

@@ -27,7 +27,7 @@ requires-python = ">=3.9,<3.14"
 dependencies = [
     "click>=3.2",
     "click_log>=0.2.0",
-    "icalendar>=6.0.0",
+    "icalendar>=6.0.0,<8.0.0",
     "urwid>=2.6.15",
     "pyxdg",
     "pytz",

tests/cli_test.py

@@ -507,9 +507,8 @@ def test_print_bad_ics(runner):
     runner = runner()
     result = runner.invoke(main_khal, ['printics', _get_ics_filepath('non_dst_error')])
     assert result.exception
-    expected = ValueError("Invalid iCalendar duration: PT-2H")
-    assert expected.__class__ == result.exception.__class__
-    assert expected.args == result.exception.args
+    assert isinstance(result.exception, ValueError)
+    assert str(result.exception) == "Invalid iCalendar duration: PT-2H"
 
 def test_import(runner, monkeypatch):
     runner = runner()

tests/utils.py

@@ -7,6 +7,12 @@
 from khal.khalendar import CalendarCollection
 from khal.khalendar.vdir import Vdir
 
+try:
+    from icalendar.parser import Contentlines  # icalendar >= 7.0.0
+except ImportError:
+    from icalendar.cal import Contentlines  # icalendar < 7.0.0  # noqa: F401
+
+
 CollVdirType = tuple[CalendarCollection, dict[str, Vdir]]
 
 cal0 = 'a_calendar'
@@ -75,7 +81,7 @@ def normalize_component(x):
     x = icalendar.cal.Component.from_ical(x)
 
     def inner(c):
-        contentlines = icalendar.cal.Contentlines()
+        contentlines = Contentlines()
         for name, value in c.property_items(sorted=True, recursive=False):
             contentlines.append(c.content_line(name, value, sorted=True))
         contentlines.append('')