Fix style issues and accept HTTP 415 in link checker

- Apply ruff formatting to files that drifted during rebase
- Remove duplicate get_feature_preset_name function
- Accept HTTP 415 in lychee link checker (flaky external site)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: tobixen

.github/workflows/linkcheck.yml

@@ -14,5 +14,6 @@ jobs:
         args: >-
           --timeout 10
           --max-retries 2
+          --accept 415
           '**/*.md'
           '**/*.rst'

caldav/calendarobjectresource.py

@@ -863,7 +863,7 @@ def _generate_url(self):
         ## TODO: should try to wrap my head around issues that arises when id contains weird characters.  maybe it's
         ## better to generate a new uuid here, particularly if id is in some unexpected format.
         url = self.parent.url.join(quote(self.id.replace("/", "%2F")) + ".ics")
-        assert ' ' not in str(url)
+        assert " " not in str(url)
         return url
 
     def change_attendee_status(self, attendee: Any | None = None, **kwargs) -> None:

caldav/config.py

@@ -105,13 +105,9 @@ def read_config(fn, interactive_error=False):
                         return yaml.load(config_file, yaml.Loader)
                 except (yaml.scanner.ScannerError, yaml.parser.ParserError) as e:
                     # Re-raise YAML errors so they can be handled by caller
-                    raise ValueError(
-                        f"config file {fn} is neither valid JSON nor YAML: {e}"
-                    ) from e
+                    raise ValueError(f"config file {fn} is neither valid JSON nor YAML: {e}") from e
             except ImportError:
-                raise ValueError(
-                    f"config file {fn} is not valid JSON, and pyyaml is not installed"
-                )
+                raise ValueError(f"config file {fn} is not valid JSON, and pyyaml is not installed")
 
     except FileNotFoundError:
         ## File not found

caldav/davclient.py

@@ -263,7 +263,7 @@ def __init__(
             # Strip "compatibility_hints." prefix if present
             feature_name = features
             if feature_name.startswith("compatibility_hints."):
-                feature_name = feature_name[len("compatibility_hints."):]
+                feature_name = feature_name[len("compatibility_hints.") :]
             features = getattr(caldav.compatibility_hints, feature_name)
         self.features = FeatureSet(features)
         self.huge_tree = huge_tree

caldav/davobject.py

@@ -96,7 +96,7 @@ def __init__(
             self.url = None
         else:
             self.url = URL.objectify(url)
-        assert not ' ' in str(self.url)
+        assert " " not in str(self.url)
 
     @property
     def canonical_url(self) -> str:

tests/test_async_integration.py

@@ -207,9 +207,7 @@ async def async_task_list(self, async_client: Any) -> Any:
         # Check if server supports mixed calendars
         supports_mixed = True
         if hasattr(async_client, "features") and async_client.features:
-            supports_mixed = async_client.features.is_supported(
-                "save-load.todo.mixed-calendar"
-            )
+            supports_mixed = async_client.features.is_supported("save-load.todo.mixed-calendar")
 
         calendar_name = f"async-task-list-{datetime.now().strftime('%Y%m%d%H%M%S%f')}"
 

tests/test_caldav.py

@@ -50,14 +50,14 @@
 # RFC6638 users for scheduling tests - loaded from config file
 _config = load_test_server_config()
 rfc6638_users = _config.get("rfc6638_users", [])
+from caldav import Calendar, DAVObject, Event, FreeBusy, Principal, Todo
 from caldav.compatibility_hints import (
     incompatibility_description,
 )  ## TEMP - should be removed in the future
 from caldav.davclient import CONNKEYS, DAVClient, DAVResponse
 from caldav.elements import cdav, dav, ical
 from caldav.lib import error
 from caldav.lib.python_utilities import to_local, to_str
-from caldav import Calendar, DAVObject, Event, FreeBusy, Principal, Todo
 from caldav.search import CalDAVSearcher
 
 log = logging.getLogger("caldav")

tests/test_servers/config_loader.py

@@ -79,14 +79,11 @@ def _load_config_file(path: str) -> dict[str, dict[str, Any]]:
     try:
         cfg = read_config(path)
     except Exception as e:
-        raise ConfigParseError(
-            f"Config file '{path}' exists but could not be parsed: {e}"
-        ) from e
+        raise ConfigParseError(f"Config file '{path}' exists but could not be parsed: {e}") from e
 
     if not cfg:
         raise ConfigParseError(
-            f"Config file '{path}' exists but could not be parsed. "
-            "Check the YAML/JSON syntax."
+            f"Config file '{path}' exists but could not be parsed. Check the YAML/JSON syntax."
         )
 
     cfg = expand_env_vars(cfg)

tests/test_servers/registry.py

@@ -157,9 +157,7 @@ def load_from_config(self, config: dict) -> None:
                 server = server_class(server_config)
                 self.register(server)
             except Exception as e:
-                raise ValueError(
-                    f"Server '{name}': failed to create server instance: {e}"
-                ) from e
+                raise ValueError(f"Server '{name}': failed to create server instance: {e}") from e
 
     def auto_discover(self) -> None:
         """
@@ -281,6 +279,7 @@ def get_registry() -> ServerRegistry:
         except Exception as e:
             # Log unexpected errors but don't silently ignore them
             import warnings
+
             warnings.warn(
                 f"Failed to load test server configuration: {e}. "
                 "Check tests/caldav_test_servers.yaml for errors.",

tests/test_servers/test_config_loader.py

@@ -49,7 +49,7 @@ def test_invalid_json_and_yaml_raises_error(self, tmp_path: Path) -> None:
         """Test that content invalid as both JSON and YAML raises ConfigParseError."""
         config_file = tmp_path / "test_servers.json"
         # This is invalid for both JSON and YAML parsers
-        config_file.write_text('{{{{invalid syntax}}}}')
+        config_file.write_text("{{{{invalid syntax}}}}")
         with pytest.raises(ConfigParseError) as exc_info:
             load_test_server_config(str(config_file))
         assert "could not be parsed" in str(exc_info.value)