Apply pyupgrade for Python 3.9+ syntax

This should have been included in 14b086b when Python 3.8 support was dropped.

Changes were automatically applied by running:
pre_commit run --all-files

Signed-off-by: James Butler <[email protected]>

.pre-commit-config.yaml

@@ -37,7 +37,7 @@ repos:
     rev: v3.19.0
     hooks:
       - id: pyupgrade
-        args: [--py38-plus, --keep-runtime-typing]
+        args: [--py39-plus, --keep-runtime-typing]
         name: Upgrade code with exceptions
         exclude: |
           (?x)(

monai/apps/detection/networks/retinanet_network.py

@@ -42,7 +42,7 @@
 import math
 import warnings
 from collections.abc import Callable, Sequence
-from typing import Any, Dict
+from typing import Any
 
 import torch
 from torch import Tensor, nn
@@ -330,7 +330,7 @@ def forward(self, images: Tensor) -> Any:
         features = self.feature_extractor(images)
         if isinstance(features, Tensor):
             feature_maps = [features]
-        elif torch.jit.isinstance(features, Dict[str, Tensor]):
+        elif torch.jit.isinstance(features, dict[str, Tensor]):
             feature_maps = list(features.values())
         else:
             feature_maps = list(features)

monai/apps/detection/transforms/array.py

@@ -15,7 +15,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Sequence
+from typing import Any
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/apps/detection/utils/anchor_utils.py

@@ -39,7 +39,8 @@
 
 from __future__ import annotations
 
-from typing import List, Sequence
+
+from collections.abc import Sequence
 
 import torch
 from torch import Tensor, nn
@@ -106,7 +107,7 @@ class AnchorGenerator(nn.Module):
             anchor_generator = AnchorGenerator(sizes, aspect_ratios)
     """
 
-    __annotations__ = {"cell_anchors": List[torch.Tensor]}
+    __annotations__ = {"cell_anchors": list[torch.Tensor]}
 
     def __init__(
         self,
@@ -364,7 +365,7 @@ class AnchorGeneratorWithAnchorShape(AnchorGenerator):
             anchor_generator = AnchorGeneratorWithAnchorShape(feature_map_scales, base_anchor_shapes)
     """
 
-    __annotations__ = {"cell_anchors": List[torch.Tensor]}
+    __annotations__ = {"cell_anchors": list[torch.Tensor]}
 
     def __init__(
         self,

monai/apps/generation/maisi/networks/autoencoderkl_maisi.py

@@ -13,7 +13,7 @@
 
 import gc
 import logging
-from typing import Sequence
+from collections.abc import Sequence
 
 import torch
 import torch.nn as nn

monai/apps/generation/maisi/networks/controlnet_maisi.py

@@ -11,7 +11,7 @@
 
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import torch
 

monai/apps/pathology/engines/utils.py

@@ -11,7 +11,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Sequence
+from typing import Any
+
+from collections.abc import Sequence
 
 import torch
 

monai/apps/pathology/inferers/inferer.py

@@ -11,7 +11,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Sequence
+from typing import Any, Callable
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/apps/pathology/metrics/lesion_froc.py

@@ -11,7 +11,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Iterable
+from typing import TYPE_CHECKING, Any
+
+from collections.abc import Iterable
 
 import numpy as np
 

monai/apps/pathology/transforms/post/array.py

@@ -12,7 +12,9 @@
 from __future__ import annotations
 
 import warnings
-from typing import Callable, Sequence
+from typing import Callable
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/apps/tcia/utils.py

@@ -12,7 +12,7 @@
 from __future__ import annotations
 
 import os
-from typing import Iterable
+from collections.abc import Iterable
 
 import monai
 from monai.config.type_definitions import PathLike

monai/apps/utils.py

@@ -136,10 +136,7 @@ def check_hash(filepath: PathLike, val: str | None = None, hash_type: str = "md5
         return True
     actual_hash_func = look_up_option(hash_type.lower(), SUPPORTED_HASH_TYPES)
 
-    if sys.version_info >= (3, 9):
-        actual_hash = actual_hash_func(usedforsecurity=False)  # allows checks on FIPS enabled machines
-    else:
-        actual_hash = actual_hash_func()
+    actual_hash = actual_hash_func(usedforsecurity=False)  # allows checks on FIPS enabled machines
 
     try:
         with open(filepath, "rb") as f:

monai/apps/vista3d/transforms.py

@@ -12,7 +12,7 @@
 from __future__ import annotations
 
 import warnings
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/bundle/reference_resolver.py

@@ -14,7 +14,9 @@
 import re
 import warnings
 from collections.abc import Sequence
-from typing import Any, Iterator
+from typing import Any
+
+from collections.abc import Iterator
 
 from monai.bundle.config_item import ConfigComponent, ConfigExpression, ConfigItem
 from monai.bundle.utils import DEPRECATED_ID_MAPPING, ID_REF_KEY, ID_SEP_KEY

monai/bundle/workflows.py

@@ -19,7 +19,9 @@
 from copy import copy
 from logging.config import fileConfig
 from pathlib import Path
-from typing import Any, Sequence
+from typing import Any
+
+from collections.abc import Sequence
 
 from monai.apps.utils import get_logger
 from monai.bundle.config_parser import ConfigParser

monai/config/type_definitions.py

@@ -12,7 +12,9 @@
 from __future__ import annotations
 
 import os
-from typing import Collection, Hashable, Iterable, Sequence, TypeVar, Union
+from typing import TypeVar, Union
+
+from collections.abc import Collection, Hashable, Iterable, Sequence
 
 import numpy as np
 import torch

monai/data/meta_obj.py

@@ -14,7 +14,9 @@
 import itertools
 import pprint
 from copy import deepcopy
-from typing import Any, Iterable
+from typing import Any
+
+from collections.abc import Iterable
 
 import numpy as np
 import torch

monai/data/meta_tensor.py

@@ -14,7 +14,9 @@
 import functools
 import warnings
 from copy import deepcopy
-from typing import Any, Sequence
+from typing import Any
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/engines/evaluator.py

@@ -12,7 +12,9 @@
 from __future__ import annotations
 
 import warnings
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Any, Callable
+
+from collections.abc import Iterable, Sequence
 
 import torch
 from torch.utils.data import DataLoader

monai/engines/trainer.py

@@ -12,7 +12,9 @@
 from __future__ import annotations
 
 import warnings
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Any, Callable
+
+from collections.abc import Iterable, Sequence
 
 import torch
 from torch.optim.optimizer import Optimizer

monai/engines/utils.py

@@ -13,7 +13,9 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Sequence
-from typing import TYPE_CHECKING, Any, Mapping, cast
+from typing import TYPE_CHECKING, Any, cast
+
+from collections.abc import Mapping
 
 import torch
 import torch.nn as nn

monai/handlers/clearml_handlers.py

@@ -11,7 +11,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Mapping, Sequence
+from typing import TYPE_CHECKING, Any
+
+from collections.abc import Mapping, Sequence
 
 from monai.utils import optional_import
 

monai/inferers/utils.py

@@ -13,7 +13,9 @@
 
 import itertools
 from collections.abc import Callable, Mapping, Sequence
-from typing import Any, Iterable
+from typing import Any
+
+from collections.abc import Iterable
 
 import numpy as np
 import torch

monai/metrics/utils.py

@@ -14,7 +14,9 @@
 import warnings
 from functools import lru_cache, partial
 from types import ModuleType
-from typing import Any, Iterable, Sequence
+from typing import Any
+
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 import torch

monai/transforms/intensity/dictionary.py

@@ -17,7 +17,9 @@
 
 from __future__ import annotations
 
-from typing import Callable, Hashable, Mapping, Sequence
+from typing import Callable
+
+from collections.abc import Hashable, Mapping, Sequence
 
 import numpy as np
 

monai/transforms/lazy/functional.py

@@ -11,7 +11,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Mapping, Sequence
+from typing import Any
+
+from collections.abc import Mapping, Sequence
 
 import torch
 

monai/transforms/spatial/array.py

@@ -18,7 +18,9 @@
 from collections.abc import Callable
 from copy import deepcopy
 from itertools import zip_longest
-from typing import Any, Optional, Sequence, Tuple, Union, cast
+from typing import Any, Optional, Union, cast
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch
@@ -116,7 +118,7 @@
     "RandSimulateLowResolution",
 ]
 
-RandRange = Optional[Union[Sequence[Union[Tuple[float, float], float]], float]]
+RandRange = Optional[Union[Sequence[Union[tuple[float, float], float]], float]]
 
 
 class SpatialResample(InvertibleTransform, LazyTransform):

monai/transforms/utility/dictionary.py

@@ -20,7 +20,9 @@
 import re
 from collections.abc import Callable, Hashable, Mapping
 from copy import deepcopy
-from typing import Any, Sequence, cast
+from typing import Any, cast
+
+from collections.abc import Sequence
 
 import numpy as np
 import torch

monai/transforms/utils_morphological_ops.py

@@ -11,7 +11,7 @@
 
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import torch
 import torch.nn.functional as F

monai/utils/component_store.py

@@ -14,7 +14,9 @@
 from collections import namedtuple
 from keyword import iskeyword
 from textwrap import dedent, indent
-from typing import Any, Callable, Iterable, TypeVar
+from typing import Any, Callable, TypeVar
+
+from collections.abc import Iterable
 
 T = TypeVar("T")
 

monai/utils/decorators.py

@@ -15,7 +15,9 @@
 
 __all__ = ["RestartGenerator", "MethodReplacer"]
 
-from typing import Callable, Generator
+from typing import Callable
+
+from collections.abc import Generator
 
 
 class RestartGenerator:

monai/utils/module.py

@@ -25,7 +25,9 @@
 from pydoc import locate
 from re import match
 from types import FunctionType, ModuleType
-from typing import Any, Iterable, cast
+from typing import Any, cast
+
+from collections.abc import Iterable
 
 import torch
 

monai/utils/state_cacher.py

@@ -16,7 +16,9 @@
 import pickle
 import tempfile
 from types import ModuleType
-from typing import Any, Hashable
+from typing import Any
+
+from collections.abc import Hashable
 
 import torch
 from torch.serialization import DEFAULT_PROTOCOL