From ab4d0f54cc1c0ac66baafaf24199d39a2767faf9 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 12 Oct 2024 20:48:37 +0200 Subject: [PATCH 1/2] Apply ruff/flynt rule FLY002 FLY002 Consider f-string instead of string join --- fsspec/gui.py | 2 +- fsspec/implementations/reference.py | 6 ++---- fsspec/utils.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fsspec/gui.py b/fsspec/gui.py index 321379eb8..4755ad813 100644 --- a/fsspec/gui.py +++ b/fsspec/gui.py @@ -119,7 +119,7 @@ def _signal(self, event): widget components. """ if not self._ignoring_events: - wn = "-".join([event.obj.name, event.name]) + wn = f"{event.obj.name}-{event.name}" if wn in self._map and self._map[wn] in self._sigs: self._emit(self._map[wn], event.new) diff --git a/fsspec/implementations/reference.py b/fsspec/implementations/reference.py index 35da812c6..e1854d7f3 100644 --- a/fsspec/implementations/reference.py +++ b/fsspec/implementations/reference.py @@ -162,9 +162,7 @@ def __getattr__(self, item): def setup(self): self._items = {} - self._items[".zmetadata"] = self.fs.cat_file( - "/".join([self.root, ".zmetadata"]) - ) + self._items[".zmetadata"] = self.fs.cat_file(f"{self.root}/.zmetadata") met = json.loads(self._items[".zmetadata"]) self.record_size = met["record_size"] self.zmetadata = met["metadata"] @@ -212,7 +210,7 @@ def create(root, storage_options=None, fs=None, record_size=10000, **kwargs): if fs.exists(root): fs.rm(root, recursive=True) fs.makedirs(root, exist_ok=True) - fs.pipe("/".join([root, ".zmetadata"]), json.dumps(met).encode()) + fs.pipe(f"{root}/.zmetadata", json.dumps(met).encode()) return LazyReferenceMapper(root, fs, **kwargs) @lru_cache() diff --git a/fsspec/utils.py b/fsspec/utils.py index 917af8d19..0bfbab225 100644 --- a/fsspec/utils.py +++ b/fsspec/utils.py @@ -75,7 +75,7 @@ def infer_storage_options( parsed_path = urlsplit(urlpath) protocol = parsed_path.scheme or "file" if parsed_path.fragment: - path = "#".join([parsed_path.path, parsed_path.fragment]) + path = f"{parsed_path.path}#{parsed_path.fragment}" else: path = parsed_path.path if protocol == "file": @@ -416,7 +416,7 @@ def other_paths( if exists: cp = cp.rsplit("/", 1)[0] if not cp and all(not s.startswith("/") for s in paths): - path2 = ["/".join([path2, p]) for p in paths] + path2 = [f"{path2}/{p}" for p in paths] else: path2 = [p.replace(cp, path2, 1) for p in paths] else: From dab14283833ba238ce28b8fae9257d2ab19918b9 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 12 Oct 2024 20:49:20 +0200 Subject: [PATCH 2/2] Enforce ruff/flynt rules (FLY) --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 9c2355625..db1e5d361 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,6 +161,7 @@ select = [ "E7", "E9", "F", + "FLY", "FURB", "I", "LOG",