Simplifying and correcting some type hinting

Author: cmbasnett

bdk_addon/bdk/operators.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 from pathlib import Path
-from typing import Set, cast
+from typing import cast
 
 import bpy
 from bpy.types import Operator, Context, Node, Event, Armature, Mesh
@@ -377,7 +377,7 @@ def poll(cls, context: 'Context'):
             return False
         return True
 
-    def execute(self, context: Context) -> Set[str]:
+    def execute(self, context: Context) -> set[str]:
         library_path: Path
         assets = context.selected_assets
 

bdk_addon/bdk/repository/kernel.py

@@ -15,23 +15,22 @@
 
 from .properties import BDK_PG_repository, BDK_PG_repository_package
 from pathlib import Path
-from typing import Optional, List, Dict
 
 from ...data import UReference
 from ...helpers import get_addon_preferences
 from ...io.config import ConfigParserMultiOpt
 import json
 
 
-def is_game_directory_and_mod_valid(game_directory: Path, mod: Optional[str]) -> bool:
+def is_game_directory_and_mod_valid(game_directory: Path, mod: str | None) -> bool:
     try:
         read_repository_package_patterns(game_directory, mod)
         return True
     except FileNotFoundError:
         return False
 
 
-def read_repository_package_patterns(game_directory: Path, mod: Optional[str]) -> List[Path]:
+def read_repository_package_patterns(game_directory: Path, mod: str | None) -> list[Path]:
     # Determine the asset paths.
     game_directory = Path(game_directory)
     game_system_directory = game_directory / 'System'
@@ -93,12 +92,12 @@ def parse_config_package_patterns(path: Path):
 class Manifest:
     class Package:
         def __init__(self):
-            self.exported_time: Optional[datetime] = None
-            self.build_time: Optional[datetime] = None
+            self.exported_time: datetime | None = None
+            self.build_time: datetime | None = None
 
     def __init__(self, path: str):
         self.path = path
-        self.packages: Dict[str, Manifest.Package] = dict()
+        self.packages: dict[str, Manifest.Package] = dict()
 
     def has_package(self, package_path: str) -> bool:
         return package_path in self.packages

bdk_addon/bdk/ui.py

@@ -14,6 +14,8 @@ class BDK_MT_object_add_menu(Menu):
     bl_label = 'BDK'
 
     def draw(self, context):
+        if self.layout is None:
+            return
         self.layout.operator(terrain_operators.BDK_OT_terrain_info_add.bl_idname, text='Terrain Info', icon='GRID')
         self.layout.operator_menu_enum(terrain_doodad_operators.BDK_OT_terrain_doodad_add.bl_idname, 'object_type',
                                        text='Terrain Doodad', icon='CURVE_DATA')
@@ -39,6 +41,8 @@ def poll(cls, context):
     def draw(self, context):
         node_tree = context.space_data.edit_tree
         layout = self.layout
+        if layout is None:
+            return
         layout.use_property_split = True
         layout.use_property_decorate = False
         layout.prop(node_tree.bdk, 'build_hash', text='Build Hash', icon='KEYINGSET', emboss=False)

bdk_addon/bin/blend.py

@@ -38,7 +38,7 @@ def build(args):
     # are in the .blend file before it evaluates any static meshes.
     material_files = []
     static_mesh_files = []
-    new_ids: List[bpy.types.ID] = []
+    new_ids: list[bpy.types.ID] = []
 
     for file in glob.glob('**/*.props.txt', root_dir=args.input_directory):
         # The class type of the object is the directory name of the parent folder.

bdk_addon/bsp/builder.py

@@ -16,7 +16,7 @@
 from bmesh.types import BMFace
 from bpy.types import Object, Mesh, NodeTree, bpy_struct
 from math import isnan
-from typing import Optional, Dict, Tuple, List, cast
+from typing import cast
 import mathutils
 import numpy as np
 
@@ -92,8 +92,8 @@ class BrushMappingErrorType(Enum):
 
 
 class BrushMappingError:
-    def __init__(self, brush_index: int, error_type: BrushMappingErrorType, level_polygon_index: Optional[int] = None,
-                 brush_polygon_index: Optional[int] = None) -> None:
+    def __init__(self, brush_index: int, error_type: BrushMappingErrorType, level_polygon_index: int | None = None,
+                 brush_polygon_index: int | None = None) -> None:
         self.brush_index = brush_index
         self.error_type = error_type
         self.level_polygon_index = level_polygon_index
@@ -111,7 +111,7 @@ def __init__(self):
         self.face_count = 0
         self.brush_count = 0
         self.missing_brush_count = 0
-        self.errors: List[BrushMappingError] = []
+        self.errors: list[BrushMappingError] = []
         self.duration = 0.0
 
 
@@ -223,7 +223,7 @@ def apply_level_to_brush_mapping(level_object: Object) -> BrushMappingResult:
     return result
 
 
-def build_level_polygon_to_brush_polygon_mapping(level_object: Object) -> Dict[int, Dict[int, int]]:
+def build_level_polygon_to_brush_polygon_mapping(level_object: Object) -> dict[int, dict[int, int]]:
     """
     Build a mapping from the level object's polygons to the brush object's polygons.
     """
@@ -238,7 +238,7 @@ def build_level_polygon_to_brush_polygon_mapping(level_object: Object) -> Dict[i
     if BRUSH_POLYGON_INDEX_ATTRIBUTE_NAME in mesh_data.attributes:
         mesh_data.attributes[BRUSH_POLYGON_INDEX_ATTRIBUTE_NAME].data.foreach_get('value', brush_polygon_indices)
 
-    mapping: Dict[int, Dict[int, int]] = {}
+    mapping: dict[int, dict[int, int]] = {}
 
     for polygon_index, (brush_index, brush_polygon_index) in enumerate(zip(brush_indices, brush_polygon_indices)):
         if brush_index not in mapping:
@@ -501,7 +501,7 @@ def create_bsp_brush_polygon(
         texture_height: int, 
         uv_layer,
         face: BMFace,
-        transform_matrix: Matrix) -> Tuple[Vector, Quaternion, Vector]:
+        transform_matrix: Matrix) -> tuple[Vector, Quaternion, Vector]:
     texture_coordinates = [loop[uv_layer].uv for loop in face.loops[0:3]]
 
     u_tiling = 1

bdk_addon/bsp/operators.py

@@ -13,7 +13,7 @@
 from bpy.types import Operator, Object, Context, Depsgraph, Mesh, Material, Event
 from collections import OrderedDict
 from enum import Enum
-from typing import cast, List, Optional, Tuple, Set
+from typing import cast
 from bdk_py import Poly, Brush, csg_rebuild, BspBuildOptions
 import bmesh
 import bpy
@@ -142,13 +142,13 @@ def draw(self, context):
             flow.prop(self, 'poly_flags')
 
     def execute(self, context):
-        def set_flags(bsp_brush: BDK_PG_bsp_brush, flags: Set[str]):
+        def set_flags(bsp_brush: BDK_PG_bsp_brush, flags: set[str]):
             bsp_brush.poly_flags = flags
 
-        def add_flags(bsp_brush: BDK_PG_bsp_brush, flags: Set[str]):
+        def add_flags(bsp_brush: BDK_PG_bsp_brush, flags: set[str]):
             bsp_brush.poly_flags |= flags
 
-        def remove_flags(bsp_brush: BDK_PG_bsp_brush, flags: Set[str]):
+        def remove_flags(bsp_brush: BDK_PG_bsp_brush, flags: set[str]):
             bsp_brush.poly_flags -= flags
 
         def get_operation_function(operation: str):
@@ -379,7 +379,7 @@ class BspBrushError(Enum):
     TWISTED_FACE = 3
 
 
-def get_bsp_brush_errors(obj: Object, depsgraph: Depsgraph) -> List[Tuple[BspBrushError, int]]:
+def get_bsp_brush_errors(obj: Object, depsgraph: Depsgraph) -> list[tuple[BspBrushError, int]]:
     """
     Check the given object for errors and return a set of all the errors that were found.
     """
@@ -746,7 +746,7 @@ def execute(self, context):
         for error in result.errors:
             self.report({'WARNING'}, str(error))
 
-        def brush_object_filter(obj: Object, instance_objects: List[Object]):
+        def brush_object_filter(obj: Object, instance_objects: list[Object]):
             if not obj.bdk.type == 'BSP_BRUSH':
                 return False
             if self.should_do_only_visible:
@@ -762,9 +762,9 @@ def brush_object_filter(obj: Object, instance_objects: List[Object]):
 
         # This is a list of the materials used for the brushes. It is populated as we iterate over the brush objects.
         # We then use this at the end to create the materials for the level object.
-        materials: List[Optional[Material]] = []
+        materials: list[Material | None] = []
 
-        def _get_or_add_material(material: Optional[Material]) -> int:
+        def _get_or_add_material(material: Material | None) -> int:
             try:
                 return materials.index(material)
             except ValueError:
@@ -790,7 +790,7 @@ def _get_or_add_material(material: Optional[Material]) -> int:
         # level object and exclude them from BSP surface tool operations.
         instanced_brush_indices = []
 
-        brushes: List[Brush] = []
+        brushes: list[Brush] = []
         for brush_index, (brush_object, asset_instances, matrix_world) in enumerate(brush_objects):
 
             if asset_instances:

bdk_addon/bsp/properties.py

@@ -3,7 +3,6 @@
      BoolProperty, StringProperty
 from bpy.types import PropertyGroup, Object, Context
 from enum import Enum
-from typing import Set
 
 
 class BrushColors(Enum):
@@ -15,7 +14,7 @@ class BrushColors(Enum):
     SemiSolid = (0.875, 0.6, 0.6, 1.0)
 
 
-def get_brush_color(csg_operation: str, poly_flags: Set[str]) -> tuple[float, float, float, float]:
+def get_brush_color(csg_operation: str, poly_flags: set[str]) -> tuple[float, float, float, float]:
     match csg_operation:
         case 'ADD':
             if 'PORTAL' in poly_flags:
@@ -67,15 +66,15 @@ def get_brush_color(csg_operation: str, poly_flags: Set[str]) -> tuple[float, fl
 __poly_flag_values_to_keys__ = {value: key for key, _, _, _, value in poly_flags_items}
 
 
-def get_poly_flags_value_from_keys(keys: Set[str]) -> int:
+def get_poly_flags_value_from_keys(keys: set[str]) -> int:
     poly_flags: int = 0
     for key in keys:
         poly_flags |= __poly_flag_keys_to_values__[key]
     return poly_flags
 
 
-def get_poly_flags_keys_from_value(values: int) -> Set[str]:
-    poly_flags: Set[str] = set()
+def get_poly_flags_keys_from_value(values: int) -> set[str]:
+    poly_flags: set[str] = set()
     for value, key in __poly_flag_values_to_keys__.items():
         if values & value:
             poly_flags.add(key)

bdk_addon/bsp/tools.py

@@ -1,4 +1,4 @@
-from typing import Callable, List
+from typing import Callable
 
 from bpy.types import NodeTree, NodeSocket
 
@@ -1481,7 +1481,7 @@ def build_function(node_tree: NodeTree):
     return ensure_geometry_node_tree('BDK Screen Space Mouse Position', items, build_function)
 
 
-ensure_functions: List[Callable[[], NodeTree]] = [
+ensure_functions: list[Callable[[], NodeTree]] = [
     ensure_bdk_axes_to_matrix_node_tree,
     ensure_bdk_duplicate_active_face_node_tree,
     ensure_bdk_move_edge_to_origin_node_tree,

bdk_addon/catalog.py

@@ -1,7 +1,7 @@
 # https://github.com/strike-digital/asset_bridge/blob/main/asset_bridge/helpers/catalog.py
 
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Optional
 from uuid import uuid4
 
 """A module for working with blender_assets.cats.txt files, and the asset catalogs that they contain"""
@@ -100,7 +100,7 @@ def update_catalog_from_file(self):
         """Read and set the catalogs from the file"""
         self.catalogs = self.get_catalogs_from_file()
 
-    def get_catalogs_from_file(self) -> Dict[str, AssetCatalog]:
+    def get_catalogs_from_file(self) -> dict[str, AssetCatalog]:
         """Read the catalogs from the file"""
         catalogs = {}
         with open(self.catalog_file, "r") as f:

bdk_addon/data.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Self
 from pathlib import Path
 import re
 from .units import unreal_to_radians
@@ -13,14 +13,14 @@ def __init__(self, r: int, g: int, b: int, a: int):
 
 
 class UReference:
-    def __init__(self, package_name: str, object_name: str, type_name: Optional[str], group_name: Optional[str] = None):
+    def __init__(self, package_name: str, object_name: str, type_name: str | None, group_name: str | None = None):
         self.type_name = type_name
         self.package_name = package_name
         self.object_name = object_name
         self.group_name = group_name
 
-    @staticmethod
-    def from_string(string: str) -> Optional['UReference']:
+    @classmethod
+    def from_string(cls,string: str) -> Self | None:
         if string == 'None' or string == '':
             return None
 
@@ -44,15 +44,15 @@ def from_string(string: str) -> Optional['UReference']:
         package_name = values[0]
         object_name = values[-1]
 
-        return UReference(package_name, object_name, type_name=type_name, group_name=group_name)
+        return cls(package_name, object_name, type_name=type_name, group_name=group_name)
 
-    @staticmethod
-    def from_path(path: Path):
+    @classmethod
+    def from_path(cls, path: Path) -> Self:
         parts = path.parts[-3:]
         package_name = parts[0]
         type_name = parts[1]
         object_name = parts[2][0:parts[2].index('.')]
-        return UReference(package_name, object_name, type_name)
+        return cls(package_name, object_name, type_name)
 
     def __str__(self):
         string = f"{self.type_name}'{self.package_name}"