chore: deal with code review concerns

Author: tobixen

caldav/async_davclient.py

@@ -72,7 +72,6 @@ def auth_flow(self, request):
 from caldav.lib import error
 from caldav.lib.python_utilities import to_wire
 from caldav.lib.url import URL
-
 from caldav.requests import HTTPBearerAuth
 from caldav.response import CalendarQueryResult, DAVResponse, PropfindResult
 

caldav/davobject.py

@@ -107,8 +107,9 @@ def is_async_client(self) -> bool:
         """
         if self.client is None:
             return False
-        # Use string check to avoid circular imports
-        return type(self.client).__name__ == "AsyncDAVClient"
+        from caldav.async_davclient import AsyncDAVClient
+
+        return isinstance(self.client, AsyncDAVClient)
 
     def children(
         self, type: str | None = None

caldav/response.py

@@ -470,7 +470,7 @@ def _parse_response(self, response: _Element) -> tuple[str, list[_Element], Any
                 error.assert_(status)
                 self.validate_status(status)
             elif elem.tag == dav.Href.tag:
-                assert not href
+                error.assert_(not href)
                 href = _normalize_href(elem.text or "")
             elif elem.tag == dav.PropStat.tag:
                 propstats.append(elem)
@@ -507,8 +507,6 @@ def _parse_scheduling_response_objects(self, parent) -> dict:
         attendee - potentially with error status for all or some
         of the wanted attendees.
 
-        TODO: some asserts here - should make better error handling
-
         Returns:
             Dict with:
               * email addresses -> FreeBusy status (raw data)
@@ -517,9 +515,9 @@ def _parse_scheduling_response_objects(self, parent) -> dict:
         """
         self.objects = {}
         self.objects["errors"] = {}
-        assert self.tree.tag == cdav.ScheduleResponse.tag
+        error.assert_(self.tree.tag == cdav.ScheduleResponse.tag)
         for response in self.tree:
-            assert response.tag == cdav.Response.tag
+            error.assert_(response.tag == cdav.Response.tag)
             parsed_response = self._parse_scheduling_response(response)
             for x in parsed_response:
                 if x.endswith(":err"):
@@ -531,8 +529,6 @@ def _parse_scheduling_response_objects(self, parent) -> dict:
 
     def _parse_scheduling_response(self, response) -> dict[str, str]:
         """
-        TODO: lots of asserts here - should make better error handling
-
         Parses one attendee response from a RFC6638 freebusy scheduling request
 
         Returns:
@@ -547,7 +543,7 @@ def _parse_scheduling_response(self, response) -> dict[str, str]:
         for x in response:
             if x.tag == cdav.Recipient.tag:
                 if len(x) == 1:
-                    assert x[0].tag == dav.Href.tag
+                    error.assert_(x[0].tag == dav.Href.tag)
                     recipient = x[0].text
                 else:
                     recipient = x.text
@@ -557,8 +553,8 @@ def _parse_scheduling_response(self, response) -> dict[str, str]:
                 calendar_data = x.text
             else:
                 raise error.DAVError(f"unexpected attribute {x.tag}")
-        assert recipient
-        assert status
+        error.assert_(recipient)
+        error.assert_(status)
         if not status.startswith("2.0"):
             ret[f"{recipient}:err"] = status
         if calendar_data:

tests/test_caldav_unit.py

@@ -1995,10 +1995,7 @@ def test_get_object_by_uid_returns_coroutine_for_async_client(self):
 
         xml_response = self._make_multistatus(ev1)
         client = MockedDAVClient(xml_response)
-        # Pretend the client is async by patching the type name
-        client.__class__ = type(
-            "AsyncDAVClient", (MockedDAVClient,), {"__module__": AsyncDAVClient.__module__}
-        )
+        client.__class__ = type("MockedAsyncDAVClient", (MockedDAVClient, AsyncDAVClient), {})
         calendar = Calendar(client, url="/calendar/")
         assert calendar.is_async_client
         uid = "20010712T182145Z-123401@example.com"
@@ -2016,9 +2013,7 @@ def test_get_object_by_uid_async_returns_correct_object(self):
         from caldav.async_davclient import AsyncDAVClient
 
         client = MockedDAVClient("")
-        client.__class__ = type(
-            "AsyncDAVClient", (MockedDAVClient,), {"__module__": AsyncDAVClient.__module__}
-        )
+        client.__class__ = type("MockedAsyncDAVClient", (MockedDAVClient, AsyncDAVClient), {})
         calendar = Calendar(client, url="/calendar/")
         uid = "20010712T182145Z-123401@example.com"
 
@@ -2072,9 +2067,7 @@ def _make_async_client_and_calendar(self):
         from caldav.async_davclient import AsyncDAVClient
 
         client = MockedDAVClient("")
-        client.__class__ = type(
-            "AsyncDAVClient", (MockedDAVClient,), {"__module__": AsyncDAVClient.__module__}
-        )
+        client.__class__ = type("MockedAsyncDAVClient", (MockedDAVClient, AsyncDAVClient), {})
         calendar = Calendar(client, url="/calendar/")
         return client, calendar