From 393a26814bca726e86cf787433ece6a29e920e80 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 29 Mar 2025 08:37:57 +0100 Subject: [PATCH 1/2] extend copyright --- radicale/app/report.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/radicale/app/report.py b/radicale/app/report.py index da06b61d..e4582f3f 100644 --- a/radicale/app/report.py +++ b/radicale/app/report.py @@ -2,7 +2,11 @@ # Copyright © 2008 Nicolas Kandel # Copyright © 2008 Pascal Halter # Copyright © 2008-2017 Guillaume Ayoub -# Copyright © 2017-2018 Unrud +# Copyright © 2017-2021 Unrud +# Copyright © 2024-2024 Pieter Hijma +# Copyright © 2024-2024 Ray +# Copyright © 2024-2024 Georgiy +# Copyright © 2024-2025 Peter Bieringer # # This library is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From f41533cca7bdd9e81389012f27792694dad24eb3 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 29 Mar 2025 08:38:16 +0100 Subject: [PATCH 2/2] fix for https://github.com/Kozea/Radicale/issues/1515 --- radicale/app/report.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/radicale/app/report.py b/radicale/app/report.py index e4582f3f..deb5a4ca 100644 --- a/radicale/app/report.py +++ b/radicale/app/report.py @@ -175,7 +175,11 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element], xmlutils.make_human_tag(root.tag), path) return client.FORBIDDEN, xmlutils.webdav_error("D:supported-report") - props: Union[ET.Element, List] = root.find(xmlutils.make_clark("D:prop")) or [] + props: Union[ET.Element, List] + if root.find(xmlutils.make_clark("D:prop")) is not None: + props = root.find(xmlutils.make_clark("D:prop")) # type: ignore[assignment] + else: + props = [] hreferences: Iterable[str] if root.tag in (