Preserve parameters in paths

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         runs-on: [ubuntu-latest]
     defaults:
       run:

src/fsspec_xrootd/xrootd.py

@@ -1,4 +1,4 @@
 from __future__ import annotations
 
 import asyncio
 import io
@@ -15,18 +15,18 @@
 from fsspec.asyn import AsyncFileSystem, _run_coros_in_chunks, sync, sync_wrapper
 from fsspec.exceptions import FSTimeoutError
 from fsspec.spec import AbstractBufferedFile
 from XRootD import client
 from XRootD.client.flags import (
     DirListFlags,
     MkDirFlags,
     OpenFlags,
     QueryCode,
     StatInfoFlags,
 )
 from XRootD.client.responses import HostList, XRootDStatus
 
 
 class ErrorCodes(IntEnum):
     INVALID_PATH = 400
 
 
@@ -35,7 +35,7 @@
 
 
 def _async_wrap(
-    func: Callable[..., XRootDStatus | tuple[XRootDStatus, T]]
+    func: Callable[..., XRootDStatus | tuple[XRootDStatus, T]],
 ) -> Callable[..., Coroutine[Any, Any, tuple[XRootDStatus, T]]]:
     """Wraps pyxrootd functions to run asynchronously. Returns an async callable
 
@@ -51,13 +51,13 @@
         asyncio.get_running_loop().create_future()
     )
 
     def callback(status: XRootDStatus, content: T, servers: HostList) -> None:
         if future.cancelled():
             return
         loop = future.get_loop()
         try:
             loop.call_soon_threadsafe(future.set_result, (status, content))
         except Exception as exc:
             loop.call_soon_threadsafe(future.set_exception, exc)
 
     async def wrapped(*args: Any, **kwargs: Any) -> tuple[XRootDStatus, T]:
@@ -142,7 +142,7 @@
     handle: client.File
 
 
 class ReadonlyFileHandleCache:
     def __init__(self, loop: Any, max_items: int | None, ttl: int):
         self.loop = loop
         self._max_items = max_items
@@ -170,7 +170,7 @@
                 item.handle.close(callback=lambda *args: None)
         cache.clear()
 
     def close_all(self) -> None:
         self._close_all(self.loop, self._cache)
 
     async def _close(self, url: str, timeout: int) -> None:
@@ -183,7 +183,7 @@
     close = sync_wrapper(_close)
 
     async def _start_pruner(self) -> None:
         self._prune_task = asyncio.create_task(self._pruner())
 
     async def _pruner(self) -> None:
         while True:
@@ -220,7 +220,7 @@
         return handle
 
 
 class XRootDFileSystem(AsyncFileSystem):  # type: ignore[misc]
     protocol = "root"
     root_marker = "/"
     default_timeout = 60
@@ -302,7 +302,7 @@
     def _strip_protocol(cls, path: str | list[str]) -> Any:
         if isinstance(path, str):
             if path.startswith(cls.protocol):
-                return client.URL(path).path.rstrip("/") or cls.root_marker
+                return client.URL(path).path_with_params.rstrip("/") or cls.root_marker
             # assume already stripped
             return path.rstrip("/") or cls.root_marker
         elif isinstance(path, list):

tests/test_basicio.py

@@ -110,7 +110,16 @@ def test_path_parsing():
             "root://serv.er//dir/",
         ]
     )
-    assert paths == ["/blah", "/more", "dir", "/dir"]
+    assert paths == [
+        "/blah",
+        "/more",
+        "dir",
+        "/dir",
+    ]
+    # get_fs_token_paths will expand glob patterns if '*', '?', or '[' are present
+    # so we need to test parameter parsing using a different method
+    fs, path = fsspec.url_to_fs("root://server.com//blah?param1=1&param2=2")
+    assert path == "/blah?param1=1&param2=2"
 
 
 def test_pickle(localserver, clear_server):