Fix ruff/pyupgrade issues (UP035)

UP035 Import from `collections.abc` instead: `Iterable`, `Iterator`, `Mapping`, `Sequence`
UP035 `typing.Dict` is deprecated, use `dict` instead
UP035 `typing.List` is deprecated, use `list` instead
UP035 `typing.Tuple` is deprecated, use `tuple` instead

https://docs.astral.sh/ruff/rules/deprecated-import/

zarr/_storage/store.py

@@ -4,7 +4,8 @@
 from collections.abc import MutableMapping
 from copy import copy
 from string import ascii_letters, digits
-from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple, Union
+from typing import Any, Optional, Union
+from collections.abc import Mapping, Sequence
 
 from zarr.meta import Metadata2, Metadata3
 from zarr.util import normalize_storage_path
@@ -183,6 +184,9 @@ def rmdir(self, path: str = "") -> None:
  _rmdir_from_keys(self, path)
 
 
+_shadowed_list = list
+
+
 class StoreV3(BaseStore):
  _store_version = 3
  _metadata_class = Metadata3
@@ -295,7 +299,7 @@ def supports_efficient_get_partial_values(self):
 
  def get_partial_values(
  self, key_ranges: Sequence[tuple[str, tuple[int, Optional[int]]]]
- ) -> list[Union[bytes, memoryview, bytearray]]:
+ ) -> _shadowed_list[Union[bytes, memoryview, bytearray]]:
  """Get multiple partial values.
  key_ranges can be an iterable of key, range pairs,
  where a range specifies two integers range_start and range_length

zarr/_storage/v3.py

@@ -3,7 +3,7 @@
 from collections import OrderedDict
 from collections.abc import MutableMapping
 from threading import Lock
-from typing import Union, Dict, Any, Optional
+from typing import Union, Any, Optional
 
 from zarr.errors import (
  MetadataError,

zarr/_storage/v3_storage_transformers.py

@@ -1,7 +1,8 @@
 import functools
 import itertools
 import os
-from typing import NamedTuple, Tuple, Optional, Union, Iterator
+from typing import NamedTuple, Optional, Union
+from collections.abc import Iterator
 
 from numcodecs.compat import ensure_bytes
 import numpy as np

zarr/creation.py

@@ -1,5 +1,6 @@
 from collections.abc import MutableMapping
-from typing import Optional, Tuple, Union, Sequence
+from typing import Optional, Union
+from collections.abc import Sequence
 from warnings import warn
 
 import numpy as np

zarr/meta.py

@@ -9,7 +9,8 @@
 from zarr.errors import MetadataError
 from zarr.util import json_dumps, json_loads
 
-from typing import cast, Union, Any, List, Mapping as MappingType, Optional, TYPE_CHECKING
+from typing import cast, Union, Any, Optional, TYPE_CHECKING
+from collections.abc import Mapping as MappingType
 
 if TYPE_CHECKING: # pragma: no cover
  from zarr._storage.store import StorageTransformer

zarr/n5.py

@@ -4,7 +4,7 @@
 import os
 import struct
 import sys
-from typing import Any, Dict, Optional, cast
+from typing import Any, Optional, cast
 import warnings
 
 import numpy as np

zarr/storage.py

@@ -33,7 +33,8 @@
 from os import scandir
 from pickle import PicklingError
 from threading import Lock, RLock
-from typing import Sequence, Mapping, Optional, Union, List, Tuple, Dict, Any
+from typing import Optional, Union, Any
+from collections.abc import Sequence, Mapping
 import uuid
 import time
 

zarr/tests/test_core.py

@@ -3,7 +3,8 @@
 import sys
 import pickle
 import shutil
-from typing import Any, Literal, Optional, Tuple, Union, Sequence
+from typing import Any, Literal, Optional, Union
+from collections.abc import Sequence
 import unittest
 from itertools import zip_longest
 from tempfile import mkdtemp

zarr/tests/test_n5.py

@@ -5,7 +5,6 @@
 from zarr.storage import atexit_rmtree
 from numcodecs import GZip
 import numpy as np
-from typing import Tuple
 import json
 import atexit
 

zarr/tests/util.py

@@ -1,7 +1,8 @@
 import collections
 import os
 import tempfile
-from typing import Any, Mapping, Sequence
+from typing import Any
+from collections.abc import Mapping, Sequence
 from zarr.context import Context
 
 from zarr.storage import Store

zarr/util.py

@@ -8,16 +8,12 @@
 from typing import (
  Any,
  Callable,
- Dict,
- Iterator,
- Mapping,
  Optional,
- Tuple,
  TypeVar,
  Union,
- Iterable,
  cast,
 )
+from collections.abc import Iterator, Mapping, Iterable
 
 import numpy as np
 from asciitree import BoxStyle, LeftAligned