Merge branch 'master' into issu653

Author: tobixen

CHANGELOG.md

@@ -18,6 +18,7 @@ This project should adhere to [Semantic Versioning](https://semver.org/spec/v2.0
 
 * Reusing a `CalDAVSearcher` across multiple `search()` calls could yield inconsistent results: the first call would return only pending tasks (correct), but subsequent calls would change behaviour because `icalendar_searcher.Searcher.check_component()` mutated the `include_completed` field from `None` to `False` as a side-effect.  Fixed by passing a copy with `include_completed` already resolved to `filter_search_results()`, leaving the original searcher object unchanged.  Fixes https://github.com/python-caldav/caldav/issues/650
 * `Calendar.get_supported_components()` raised `KeyError` when the server did not include the `supported-calendar-component-set` property in its response.  RFC 4791 section 5.2.3 states this property is optional and that its absence means all component types are accepted; the method now returns the RFC default `["VEVENT", "VTODO", "VJOURNAL"]` in that case, trimmed by any known server limitations from the compatibility hints (e.g. if `save-load.todo` is `unsupported`, `VTODO` is excluded).  Fixes https://github.com/python-caldav/caldav/issues/653
+* `_resolve_properties()` would crash with `UnboundLocalError` in production mode when a server returned an empty or unrecognisable PROPFIND response (the response paths did not match the request URI and there was more than one or zero paths returned).  Fixed by returning `{}` instead of falling through to an unbound variable.  Related: https://github.com/pycalendar/calendar-cli/issues/114
 
 ## [3.1.0] - 2026-03-19
 

caldav/davobject.py

@@ -356,6 +356,7 @@ def _resolve_properties(self, properties: dict) -> dict:
                 f"paths found: {list(properties.keys())}"
             )
             error.assert_(False)
+            return {}
         self.props.update(rc)
         return rc
 

tests/test_caldav_unit.py

@@ -2762,3 +2762,28 @@ def test_meta_section_returns_multiple_dicts(self, tmp_path):
             "https://work.example.com/dav/",
             "https://personal.example.com/dav/",
         }
+
+
+class TestResolveProperties:
+    """Tests for _resolve_properties unbound variable bug (issue #647 / calendar-cli #114)."""
+
+    def _make_calendar(self, path="/calendar/"):
+        client = DAVClient(url="https://example.com")
+        return Calendar(client=client, url=f"https://example.com{path}")
+
+    def test_resolve_properties_empty_dict_production_mode(self):
+        """In PRODUCTION mode, error.assert_ only logs; _resolve_properties must
+        not crash with UnboundLocalError when properties dict is empty."""
+        cal = self._make_calendar()
+        with mock.patch.object(error, "debugmode", "PRODUCTION"):
+            result = cal._resolve_properties({})
+        assert result == {}
+
+    def test_resolve_properties_unmatched_paths_production_mode(self):
+        """Same but with a non-empty properties dict where path does not match."""
+        cal = self._make_calendar("/calendar/")
+        with mock.patch.object(error, "debugmode", "PRODUCTION"):
+            result = cal._resolve_properties(
+                {"/other/path/": {"foo": "bar"}, "/yet/another/": {"baz": "qux"}}
+            )
+        assert result == {}