From 528df903362321b92d92eb06ce934ab5c9807288 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 18 Oct 2024 10:18:17 +1100 Subject: [PATCH] Cleanup: remove use of deprecated types for extensions (#2) Missed these in a66601ee95f641c9ccf876c08b29430a7cd97366. --- .../_bpy_internal/extensions/junction_module.py | 16 +++++++--------- .../extensions/stale_file_manager.py | 8 +++----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scripts/modules/_bpy_internal/extensions/junction_module.py b/scripts/modules/_bpy_internal/extensions/junction_module.py index d0b7a3cca01..06f71d73519 100644 --- a/scripts/modules/_bpy_internal/extensions/junction_module.py +++ b/scripts/modules/_bpy_internal/extensions/junction_module.py @@ -16,12 +16,10 @@ __all__ = ( ) import sys + from types import ModuleType -from typing import ( - Dict, - Optional, +from collections.abc import ( Sequence, - Tuple, ) @@ -36,8 +34,8 @@ def _module_file_set(module: ModuleType, name_full: str) -> None: def _module_create( name: str, *, - parent: Optional[ModuleType] = None, - doc: Optional[str] = None, + parent: ModuleType | None = None, + doc: str | None = None, ) -> ModuleType: if parent is not None: name_full = parent.__name__ + "." + name @@ -60,10 +58,10 @@ class JunctionModuleHandle: def __init__(self, module_name: str): self._module_name: str = module_name - self._module: Optional[ModuleType] = None - self._submodules: Dict[str, ModuleType] = {} + self._module: ModuleType | None = None + self._submodules: dict[str, ModuleType] = {} - def submodule_items(self) -> Sequence[Tuple[str, ModuleType]]: + def submodule_items(self) -> Sequence[tuple[str, ModuleType]]: return tuple(self._submodules.items()) def register_module(self) -> ModuleType: diff --git a/scripts/modules/_bpy_internal/extensions/stale_file_manager.py b/scripts/modules/_bpy_internal/extensions/stale_file_manager.py index 3cc4d070ac7..2345707438c 100644 --- a/scripts/modules/_bpy_internal/extensions/stale_file_manager.py +++ b/scripts/modules/_bpy_internal/extensions/stale_file_manager.py @@ -16,9 +16,7 @@ __all__ = ( ) -from typing import ( - Dict, - List, +from collections.abc import ( Sequence, ) @@ -68,10 +66,10 @@ class StaleFiles: base_directory = os.path.normpath(base_directory) self._base_directory = base_directory if base_directory.endswith(sep) else (base_directory + sep) self._stale_filename = stale_filename - self._paths: List[str] = [] + self._paths: list[str] = [] self._debug: bool = debug - self._index_cache: Dict[str, int] = {} + self._index_cache: dict[str, int] = {} self._is_modified: bool = True def is_empty(self) -> bool: