Use from __future__ import annotations

Author: alanhdu

fsspec/config.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import configparser
 import json
 import os
 import warnings
-from typing import Any, Dict
+from typing import Any
 
-conf: Dict[str, Dict[str, Any]] = {}
+conf: dict[str, dict[str, Any]] = {}
 default_conf_dir = os.path.join(os.path.expanduser("~"), ".config/fsspec")
 conf_dir = os.environ.get("FSSPEC_CONFIG_DIR", default_conf_dir)
 

fsspec/implementations/cached.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import hashlib
 import inspect
@@ -7,7 +9,7 @@
 import tempfile
 import time
 from shutil import rmtree
-from typing import ClassVar, Tuple, Union
+from typing import ClassVar
 
 from fsspec import AbstractFileSystem, filesystem
 from fsspec.callbacks import _DEFAULT_CALLBACK
@@ -40,7 +42,7 @@ class CachingFileSystem(AbstractFileSystem):
       allowed, for testing
     """
 
-    protocol: ClassVar[Union[str, Tuple[str, ...]]] = ("blockcache", "cached")
+    protocol: ClassVar[str | tuple[str, ...]] = ("blockcache", "cached")
 
     def __init__(
         self,

fsspec/implementations/memory.py

@@ -1,10 +1,10 @@
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import, annotations, division, print_function
 
 import logging
 from datetime import datetime
 from errno import ENOTEMPTY
 from io import BytesIO
-from typing import Any, ClassVar, Dict
+from typing import Any, ClassVar
 
 from fsspec import AbstractFileSystem
 
@@ -18,7 +18,7 @@ class MemoryFileSystem(AbstractFileSystem):
     in memory filesystem.
     """
 
-    store: ClassVar[Dict[str, Any]] = {}  # global, do not overwrite!
+    store: ClassVar[dict[str, Any]] = {}  # global, do not overwrite!
     pseudo_dirs = [""]  # global, do not overwrite!
     protocol = "memory"
     root_marker = "/"

fsspec/implementations/tests/test_tar.py

@@ -1,10 +1,11 @@
+from __future__ import annotations
+
 import os
 import shutil
 import tarfile
 import tempfile
 from io import BytesIO
 from pathlib import Path
-from typing import Dict
 
 import pytest
 
@@ -210,7 +211,7 @@ def test_ls_with_folders(compression: str, tmp_path: Path):
     but make sure that the reading filesystem is still able to resolve the
     intermediate folders, like the ZipFileSystem.
     """
-    tar_data: Dict[str, bytes] = {
+    tar_data: dict[str, bytes] = {
         "a.pdf": b"Hello A!",
         "b/c.pdf": b"Hello C!",
         "d/e/f.pdf": b"Hello F!",

fsspec/registry.py

@@ -1,12 +1,13 @@
+from __future__ import annotations
+
 import importlib
 import types
 import warnings
-from typing import Dict, Type
 
 __all__ = ["registry", "get_filesystem_class", "default"]
 
 # internal, mutable
-_registry: Dict[str, Type] = {}
+_registry: dict[str, type] = {}
 
 # external, immutable
 registry = types.MappingProxyType(_registry)

fsspec/spec.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import io
 import logging
 import os
@@ -7,7 +9,7 @@
 from errno import ESPIPE
 from glob import has_magic
 from hashlib import sha256
-from typing import ClassVar, Tuple, Union
+from typing import ClassVar
 
 from .callbacks import _DEFAULT_CALLBACK
 from .config import apply_config, conf
@@ -102,7 +104,7 @@ class AbstractFileSystem(metaclass=_Cached):
     _cached = False
     blocksize = 2**22
     sep = "/"
-    protocol: ClassVar[Union[str, Tuple[str, ...]]] = "abstract"
+    protocol: ClassVar[str | tuple[str, ...]] = "abstract"
     _latest = None
     async_impl = False
     mirror_sync_methods = False

fsspec/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import math
 import os
@@ -8,7 +10,6 @@
 from functools import partial
 from hashlib import md5
 from importlib.metadata import version
-from typing import Dict
 from urllib.parse import urlsplit
 
 DEFAULT_BLOCK_SIZE = 5 * 2**20
@@ -111,7 +112,7 @@ def update_storage_options(options, inherited=None):
 
 
 # Compression extensions registered via fsspec.compression.register_compression
-compressions: Dict[str, str] = {}
+compressions: dict[str, str] = {}
 
 
 def infer_compression(filename):