black style. Last minute v2.2-preparations

Author: tobixen

caldav/collection.py

@@ -1247,7 +1247,8 @@ def objects_by_sync_token(
         ## Fetch ETags for all objects if not already present
         ## ETags are crucial for detecting changes in the fallback mechanism
         if all_objects and (
-            not hasattr(all_objects[0], "props") or dav.GetEtag.tag not in all_objects[0].props
+            not hasattr(all_objects[0], "props")
+            or dav.GetEtag.tag not in all_objects[0].props
         ):
             ## Use PROPFIND to fetch ETags for all objects
             try:
@@ -1275,7 +1276,11 @@ def objects_by_sync_token(
         fake_sync_token = self._generate_fake_sync_token(all_objects)
 
         ## If a sync_token was provided, check if anything has changed
-        if sync_token and isinstance(sync_token, str) and sync_token.startswith("fake-"):
+        if (
+            sync_token
+            and isinstance(sync_token, str)
+            and sync_token.startswith("fake-")
+        ):
             ## Compare the provided token with the new token
             if sync_token == fake_sync_token:
                 ## Nothing has changed, return empty collection

tests/test_caldav.py

@@ -1347,7 +1347,12 @@ def testObjectBySyncToken(self):
         sync_info = self.is_supported("sync-token", return_type=dict)
         is_time_based = sync_info.get("behaviour") == "time-based"
         ## Consider the client-side fake sync-tokens and etag stuff to be fragile
-        is_fragile = sync_info.get("support") in ("fragile", "broken", "unsupported", "ungraceful")
+        is_fragile = sync_info.get("support") in (
+            "fragile",
+            "broken",
+            "unsupported",
+            "ungraceful",
+        )
 
         if is_time_based:
             time.sleep(1)
@@ -1466,7 +1471,12 @@ def testSync(self):
         sync_info = self.is_supported("sync-token", return_type=dict)
         is_time_based = sync_info.get("behaviour") == "time-based"
         ## Consider the client-side fake sync-tokens and etag stuff to be fragile
-        is_fragile = sync_info.get("support") in ("fragile", "broken", "unsupported", "ungraceful")
+        is_fragile = sync_info.get("support") in (
+            "fragile",
+            "broken",
+            "unsupported",
+            "ungraceful",
+        )
 
         ## Boiler plate ... make a calendar and add some content
         c = self._fixCalendar()

tests/test_sync_token_fallback.py

@@ -4,12 +4,16 @@
 These tests verify the behavior of the fake sync token implementation
 used when servers don't support sync-collection REPORT.
 """
+from unittest.mock import MagicMock
+from unittest.mock import Mock
+from unittest.mock import patch
 
 import pytest
-from unittest.mock import Mock, MagicMock, patch
-from caldav.collection import Calendar, SynchronizableCalendarObjectCollection
-from caldav.lib.url import URL
+
+from caldav.collection import Calendar
+from caldav.collection import SynchronizableCalendarObjectCollection
 from caldav.elements import dav
+from caldav.lib.url import URL
 
 
 class TestSyncTokenFallback:
@@ -22,8 +26,7 @@ def setup_method(self):
         self.mock_client.features.is_supported = Mock(return_value={})
 
         self.calendar = Calendar(
-            client=self.mock_client,
-            url=URL("http://example.com/calendar/")
+            client=self.mock_client, url=URL("http://example.com/calendar/")
         )
 
     def create_mock_object(self, url_str: str, etag: str = None, data: str = None):
@@ -110,10 +113,11 @@ def test_generate_fake_sync_token_cannot_detect_changes_without_etags(self) -> N
 
         # BUG: Tokens will be the same because we're using URLs as fallback
         # and URLs don't change when content changes
-        assert token_before == token_after, \
-            "This test documents a KNOWN BUG: without ETags, modifications aren't detected"
+        assert (
+            token_before == token_after
+        ), "This test documents a KNOWN BUG: without ETags, modifications aren't detected"
 
-    @patch.object(Calendar, 'search')
+    @patch.object(Calendar, "search")
     def test_fallback_returns_empty_when_nothing_changed(self, mock_search) -> None:
         """Test that fallback returns empty list when sync token matches."""
         # Setup: search returns same objects with ETags
@@ -125,7 +129,9 @@ def test_fallback_returns_empty_when_nothing_changed(self, mock_search) -> None:
         self.mock_client.features.is_supported.return_value = {"support": "unsupported"}
 
         # First call: get initial state
-        result1 = self.calendar.objects_by_sync_token(sync_token=None, load_objects=False)
+        result1 = self.calendar.objects_by_sync_token(
+            sync_token=None, load_objects=False
+        )
         initial_token = result1.sync_token
 
         # Second call: with same token, should return empty
@@ -136,7 +142,7 @@ def test_fallback_returns_empty_when_nothing_changed(self, mock_search) -> None:
         assert len(list(result2)) == 0, "Should return empty when nothing changed"
         assert result2.sync_token == initial_token
 
-    @patch.object(Calendar, 'search')
+    @patch.object(Calendar, "search")
     def test_fallback_returns_all_when_etag_changed(self, mock_search) -> None:
         """Test that fallback returns all objects when ETags change."""
         # First call: return objects with initial ETags
@@ -146,11 +152,15 @@ def test_fallback_returns_all_when_etag_changed(self, mock_search) -> None:
 
         self.mock_client.features.is_supported.return_value = {"support": "unsupported"}
 
-        result1 = self.calendar.objects_by_sync_token(sync_token=None, load_objects=False)
+        result1 = self.calendar.objects_by_sync_token(
+            sync_token=None, load_objects=False
+        )
         initial_token = result1.sync_token
 
         # Simulate modification: search now returns objects with changed ETags
-        obj1_modified = self.create_mock_object("http://example.com/1.ics", etag="etag-1-new")
+        obj1_modified = self.create_mock_object(
+            "http://example.com/1.ics", etag="etag-1-new"
+        )
         obj2_same = self.create_mock_object("http://example.com/2.ics", etag="etag-2")
         mock_search.return_value = [obj1_modified, obj2_same]
 
@@ -159,13 +169,19 @@ def test_fallback_returns_all_when_etag_changed(self, mock_search) -> None:
             sync_token=initial_token, load_objects=False
         )
 
-        assert len(list(result2)) == 2, "Should return all objects when changes detected"
+        assert (
+            len(list(result2)) == 2
+        ), "Should return all objects when changes detected"
         assert result2.sync_token != initial_token
 
-    @pytest.mark.xfail(reason="Mock objects don't preserve props updates properly - integration test needed")
-    @patch.object(Calendar, '_query_properties')
-    @patch.object(Calendar, 'search')
-    def test_fallback_fetches_etags_when_missing(self, mock_search, mock_query_props) -> None:
+    @pytest.mark.xfail(
+        reason="Mock objects don't preserve props updates properly - integration test needed"
+    )
+    @patch.object(Calendar, "_query_properties")
+    @patch.object(Calendar, "search")
+    def test_fallback_fetches_etags_when_missing(
+        self, mock_search, mock_query_props
+    ) -> None:
         """
         Test that fallback fetches ETags when search() doesn't return them.
 
@@ -176,25 +192,33 @@ def test_fallback_fetches_etags_when_missing(self, mock_search, mock_query_props
         props updates properly. The actual functionality works in integration tests.
         """
         # First call: return objects without ETags
-        obj1 = self.create_mock_object("http://example.com/calendar/1.ics", data="DATA1")
-        obj2 = self.create_mock_object("http://example.com/calendar/2.ics", data="DATA2")
+        obj1 = self.create_mock_object(
+            "http://example.com/calendar/1.ics", data="DATA1"
+        )
+        obj2 = self.create_mock_object(
+            "http://example.com/calendar/2.ics", data="DATA2"
+        )
         mock_search.return_value = [obj1, obj2]
 
         # Mock PROPFIND response with ETags
         mock_response = Mock()
         mock_response.expand_simple_props.return_value = {
             "http://example.com/calendar/1.ics": {dav.GetEtag.tag: "etag-1"},
-            "http://example.com/calendar/2.ics": {dav.GetEtag.tag: "etag-2"}
+            "http://example.com/calendar/2.ics": {dav.GetEtag.tag: "etag-2"},
         }
         mock_query_props.return_value = mock_response
 
         self.mock_client.features.is_supported.return_value = {"support": "unsupported"}
 
-        result1 = self.calendar.objects_by_sync_token(sync_token=None, load_objects=False)
+        result1 = self.calendar.objects_by_sync_token(
+            sync_token=None, load_objects=False
+        )
         initial_token = result1.sync_token
 
         # Verify PROPFIND was called to fetch ETags
-        assert mock_query_props.call_count >= 1, "PROPFIND should be called to fetch ETags"
+        assert (
+            mock_query_props.call_count >= 1
+        ), "PROPFIND should be called to fetch ETags"
 
         # Check that ETags were actually added to the first batch of objects
         # (This verifies the ETag fetching mechanism worked)
@@ -207,14 +231,16 @@ def test_fallback_fetches_etags_when_missing(self, mock_search, mock_query_props
         obj1_modified = self.create_mock_object(
             "http://example.com/calendar/1.ics", data="MODIFIED_DATA1"
         )
-        obj2_same = self.create_mock_object("http://example.com/calendar/2.ics", data="DATA2")
+        obj2_same = self.create_mock_object(
+            "http://example.com/calendar/2.ics", data="DATA2"
+        )
         mock_search.return_value = [obj1_modified, obj2_same]
 
         # Mock PROPFIND to return different ETag for modified object
         mock_response2 = Mock()
         mock_response2.expand_simple_props.return_value = {
             "http://example.com/calendar/1.ics": {dav.GetEtag.tag: "etag-1-new"},
-            "http://example.com/calendar/2.ics": {dav.GetEtag.tag: "etag-2"}
+            "http://example.com/calendar/2.ics": {dav.GetEtag.tag: "etag-2"},
         }
         mock_query_props.return_value = mock_response2
 
@@ -225,15 +251,19 @@ def test_fallback_fetches_etags_when_missing(self, mock_search, mock_query_props
 
         # Debug: check if ETags were added to second batch
         if obj1_modified.props:
-            print(f"DEBUG: obj1_modified props after second call: {obj1_modified.props}")
+            print(
+                f"DEBUG: obj1_modified props after second call: {obj1_modified.props}"
+            )
         if obj2_same.props:
             print(f"DEBUG: obj2_same props after second call: {obj2_same.props}")
 
         # Should return all objects because change was detected
-        assert len(list(result2)) == 2, \
-            "Should detect modification via ETags and return all objects"
-        assert result2.sync_token != initial_token, \
-            "Token should change when ETag changes"
+        assert (
+            len(list(result2)) == 2
+        ), "Should detect modification via ETags and return all objects"
+        assert (
+            result2.sync_token != initial_token
+        ), "Token should change when ETag changes"
 
 
 if __name__ == "__main__":