ruff check --select UP --fix

Author: hugovk

fsspec/caching.py

@@ -8,18 +8,11 @@
 import threading
 import warnings
 from collections import OrderedDict
+from collections.abc import Callable
 from concurrent.futures import Future, ThreadPoolExecutor
 from itertools import groupby
 from operator import itemgetter
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    ClassVar,
-    Generic,
-    NamedTuple,
-    TypeVar,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, NamedTuple, TypeVar
 
 if TYPE_CHECKING:
     import mmap

fsspec/implementations/cache_metadata.py

@@ -15,9 +15,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from typing import Any, Literal
-
-    from typing_extensions import TypeAlias
+    from typing import Any, Literal, TypeAlias
 
     from .cached import CachingFileSystem
 
@@ -57,7 +55,7 @@ def __init__(self, storage: list[str]):
     def _load(self, fn: str) -> Detail:
         """Low-level function to load metadata from specific file"""
         try:
-            with open(fn, "r") as f:
+            with open(fn) as f:
                 loaded = json.load(f)
         except ValueError:
             with open(fn, "rb") as f:

fsspec/implementations/cached.py

@@ -6,8 +6,9 @@
 import tempfile
 import time
 import weakref
+from collections.abc import Callable
 from shutil import rmtree
-from typing import TYPE_CHECKING, Any, Callable, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar
 
 from fsspec import filesystem
 from fsspec.callbacks import DEFAULT_CALLBACK

fsspec/implementations/data.py

@@ -1,6 +1,5 @@
 import base64
 import io
-from typing import Optional
 from urllib.parse import unquote
 
 from fsspec import AbstractFileSystem
@@ -50,7 +49,7 @@ def _open(
         return io.BytesIO(self.cat_file(path))
 
     @staticmethod
-    def encode(data: bytes, mime: Optional[str] = None):
+    def encode(data: bytes, mime: str | None = None):
         """Format the given data into data-URL syntax
 
         This version always base64 encodes, even when the data is ascii/url-safe.

fsspec/implementations/libarchive.py

@@ -195,7 +195,7 @@ def _open(
         if mode != "rb":
             raise NotImplementedError
 
-        data = bytes()
+        data = b""
         with self._open_archive() as arc:
             for entry in arc:
                 if entry.pathname != path:

fsspec/implementations/reference.py

@@ -219,7 +219,7 @@ def create(root, storage_options=None, fs=None, record_size=10000, **kwargs):
         fs.pipe("/".join([root, ".zmetadata"]), json.dumps(met).encode())
         return LazyReferenceMapper(root, fs, **kwargs)
 
-    @lru_cache()
+    @lru_cache
     def listdir(self):
         """List top-level directories"""
         dirs = (p.rsplit("/", 1)[0] for p in self.zmetadata if not p.startswith(".z"))

fsspec/implementations/tests/test_cached.py

@@ -185,7 +185,7 @@ def test_metadata_replace_pickle_with_json(tmpdir):
         assert f.read(5) == b"test"
 
     # Confirm metadata is in json format
-    with open(cache_fn, "r") as f:
+    with open(cache_fn) as f:
         metadata = json.load(f)
     assert list(metadata.keys()) == [make_path_posix(afile)]
 
@@ -253,7 +253,7 @@ def test_blockcache_workflow(ftp_writable, tmp_path, force_save_pickle):
         with open(tmp_path / "cache", "rb") as f:
             cache = pickle.load(f)
     else:
-        with open(tmp_path / "cache", "r") as f:
+        with open(tmp_path / "cache") as f:
             cache = json.load(f)
     assert "/out" in cache
     assert cache["/out"]["blocks"] == [0, 1]
@@ -370,7 +370,7 @@ def __ager(cache_fn, fn, del_fn=False):
                 with open(cache_fn, "rb") as f:
                     cached_files = pickle.load(f)
             else:
-                with open(cache_fn, "r") as f:
+                with open(cache_fn) as f:
                     cached_files = json.load(f)
             fn_posix = pathlib.Path(fn).as_posix()
             cached_files[fn_posix]["time"] = cached_files[fn_posix]["time"] - 691200

fsspec/implementations/tests/test_git.py

@@ -24,7 +24,7 @@ def repo():
         open(os.path.join(d, "file1"), "wb").write(b"data0")
         subprocess.call("git add file1", shell=True, cwd=d)
         subprocess.call('git commit -m "init"', shell=True, cwd=d)
-        sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
+        sha = open(os.path.join(d, ".git/refs/heads/master")).read().strip()
         open(os.path.join(d, "file1"), "wb").write(b"data00")
         subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
         subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)

fsspec/json.py

@@ -1,13 +1,8 @@
 import json
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from contextlib import suppress
 from pathlib import PurePath
-from typing import (
-    Any,
-    Callable,
-    ClassVar,
-    Optional,
-)
+from typing import Any, ClassVar
 
 from .registry import _import_class, get_filesystem_class
 from .spec import AbstractFileSystem
@@ -45,12 +40,12 @@ class FilesystemJSONDecoder(json.JSONDecoder):
     def __init__(
         self,
         *,
-        object_hook: Optional[Callable[[dict[str, Any]], Any]] = None,
-        parse_float: Optional[Callable[[str], Any]] = None,
-        parse_int: Optional[Callable[[str], Any]] = None,
-        parse_constant: Optional[Callable[[str], Any]] = None,
+        object_hook: Callable[[dict[str, Any]], Any] | None = None,
+        parse_float: Callable[[str], Any] | None = None,
+        parse_int: Callable[[str], Any] | None = None,
+        parse_constant: Callable[[str], Any] | None = None,
         strict: bool = True,
-        object_pairs_hook: Optional[Callable[[list[tuple[str, Any]]], Any]] = None,
+        object_pairs_hook: Callable[[list[tuple[str, Any]]], Any] | None = None,
     ) -> None:
         self.original_object_hook = object_hook
 

fsspec/tests/test_core.py

@@ -304,14 +304,14 @@ def test_open_file_write_with_special_characters(tmp_path, char, monkeypatch):
     with fsspec.open(file_path, "w", expand=False) as f:
         f.write(expected_content)
 
-    with open(file_path, "r") as f:
+    with open(file_path) as f:
         actual_content = f.read()
 
     monkeypatch.setattr(fsspec.core, "DEFAULT_EXPAND", False)
     with fsspec.open(file_path, "w") as f:
         f.write(expected_content * 2)
 
-    with open(file_path, "r") as f:
+    with open(file_path) as f:
         assert f.read() == actual_content * 2
 
     assert actual_content == expected_content
@@ -347,7 +347,7 @@ def test_open_files_write_with_special_characters(tmp_path, char):
     )[0] as f:
         f.write(expected_content)
 
-    with open(file_path, "r") as f:
+    with open(file_path) as f:
         actual_content = f.read()
 
     assert actual_content == expected_content