Merge pull request #1644 from pbiering/fix-python3.14

Fixes for Python 3.14
2024-12-06 05:17:15 +00:00
parent 675c5ce8cf d9e15dd7c6
commit ff5fae1663
1 changed files with 4 additions and 1 deletions
--- a/radicale/httputils.py
+++ b/radicale/httputils.py
@@ -42,7 +42,10 @@ else:
    import importlib.abc
    from importlib import resources

-    _TRAVERSABLE_LIKE_TYPE = Union[importlib.abc.Traversable, pathlib.Path]
+    if sys.version_info < (3, 13):
+        _TRAVERSABLE_LIKE_TYPE = Union[importlib.abc.Traversable, pathlib.Path]
+    else:
+        _TRAVERSABLE_LIKE_TYPE = Union[importlib.resources.abc.Traversable, pathlib.Path]

 NOT_ALLOWED: types.WSGIResponse = (
    client.FORBIDDEN, (("Content-Type", "text/plain"),),