ruff

retro_data_structures/formats/mlvl.py

@@ -5,8 +5,8 @@
 
 import itertools
 import typing
-from itertools import count
 from collections.abc import Iterator
+from itertools import count
 
 import construct
 from construct import (
@@ -434,7 +434,7 @@ def next_instance_id(self) -> int:
  ids = [instance.id.instance for layer in self.layers for instance in layer.instances]
  return next(i for i in count() if i not in ids)
 
- def get_instance(self, instance_id: typing.Union[int, InstanceId]) -> typing.Optional[ScriptInstanceHelper]:
+ def get_instance(self, instance_id: int | InstanceId) -> ScriptInstanceHelper | None:
  if not isinstance(instance_id, InstanceId):
  instance_id = InstanceId(instance_id)
 

retro_data_structures/formats/script_layer.py

@@ -108,7 +108,7 @@ def instances(self):
  for instance in self._raw.script_instances:
  yield ScriptInstanceHelper(instance, self.target_game, on_modify=self.mark_modified)
 
- def get_instance(self, instance_id: int) -> Optional[ScriptInstanceHelper]:
+ def get_instance(self, instance_id: int) -> ScriptInstanceHelper:
  for instance in self.instances:
  if instance.id_matches(instance_id):
  return instance
@@ -154,7 +154,7 @@ def add_existing_instance(self, instance: ScriptInstanceHelper) -> ScriptInstanc
  instance.id = new_id
  return self._internal_add_instance(instance)
 
- def remove_instance(self, instance: Union[int, str, ScriptInstanceHelper]):
+ def remove_instance(self, instance: int | str | ScriptInstanceHelper):
  if isinstance(instance, str):
  instance = self.get_instance_by_name(instance)
  if isinstance(instance, ScriptInstanceHelper):

retro_data_structures/formats/script_object.py

@@ -268,7 +268,7 @@ def id(self, value):
  self._raw.id = InstanceId(value)
  self.on_modify()
 
- def id_matches(self, id: typing.Union[int, InstanceId]) -> bool:
+ def id_matches(self, id: int | InstanceId) -> bool:
  if not isinstance(id, InstanceId):
  id = InstanceId(id)