ruff

don't i have a commit hook set up for this???
randovania · Jun 23, 2023 · 3854d1c · 3854d1c
1 parent a88cba0
commit 3854d1c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/retro_data_structures/formats/mlvl.py b/retro_data_structures/formats/mlvl.py
@@ -3,10 +3,8 @@
 """
 from __future__ import annotations
 
-import itertools
 import typing
 from collections.abc import Iterator
-from itertools import count
 
 import construct
 from construct import (
@@ -38,17 +36,14 @@
 from retro_data_structures.construct_extensions.misc import PrefixedArrayWithExtra
 from retro_data_structures.exceptions import UnknownAssetId
 from retro_data_structures.formats import Mapw
-from retro_data_structures.formats.cmdl import dependencies_for_material_set
 from retro_data_structures.formats.guid import GUID
-from retro_data_structures.formats.mrea import Area, Mrea
+from retro_data_structures.formats.mrea import Area
 from retro_data_structures.formats.savw import Savw
-from retro_data_structures.formats.script_layer import ScriptLayer, new_layer
-from retro_data_structures.formats.script_object import InstanceId, ScriptInstance
 from retro_data_structures.formats.strg import Strg
 from retro_data_structures.game_check import Game
 
 if typing.TYPE_CHECKING:
- from retro_data_structures.asset_manager import AssetManager
+ pass
 
 MLVLConnectingDock = Struct(
  area_index=Int32ub,

diff --git a/retro_data_structures/formats/mrea.py b/retro_data_structures/formats/mrea.py
@@ -2,6 +2,7 @@
 Wiki: https://wiki.axiodl.com/w/MREA_(Metroid_Prime_2)
 """
 from __future__ import annotations
+
 import copy
 import io
 import itertools
@@ -35,7 +36,10 @@
 from retro_data_structures.formats.cmdl import dependencies_for_material_set
 from retro_data_structures.formats.lights import Lights
 from retro_data_structures.formats.script_layer import SCGN, SCLY, ScriptLayer, new_layer
-from retro_data_structures.formats.script_object import InstanceId, InstanceIdRef, InstanceRef, ScriptInstance, resolve_instance_id
+from retro_data_structures.formats.script_object import (
+ InstanceRef,
+ ScriptInstance,
+)
 from retro_data_structures.formats.strg import Strg
 from retro_data_structures.formats.visi import VISI
 from retro_data_structures.formats.world_geometry import lazy_world_geometry

diff --git a/retro_data_structures/formats/script_layer.py b/retro_data_structures/formats/script_layer.py
@@ -25,7 +25,14 @@
 from retro_data_structures.base_resource import Dependency
 from retro_data_structures.common_types import FourCC
 from retro_data_structures.construct_extensions.misc import Skip
-from retro_data_structures.formats.script_object import ConstructScriptInstance, InstanceId, InstanceIdRef, InstanceRef, ScriptInstance, resolve_instance_id
+from retro_data_structures.formats.script_object import (
+ ConstructScriptInstance,
+ InstanceId,
+ InstanceIdRef,
+ InstanceRef,
+ ScriptInstance,
+ resolve_instance_id,
+)
 from retro_data_structures.game_check import Game
 from retro_data_structures.properties import BaseObjectType
 
@@ -76,7 +83,11 @@ def new_layer(index: int | None, target_game: Game) -> Container:
  })
 
 
-SCLY = IfThenElse(game_check.current_game_at_least(game_check.Game.ECHOES), ConstructScriptLayer("SCLY"), ScriptLayerPrime)
+SCLY = IfThenElse(
+ game_check.current_game_at_least(game_check.Game.ECHOES),
+ ConstructScriptLayer("SCLY"),
+ ScriptLayerPrime
+)
 SCGN = ConstructScriptLayer("SCGN")
 
 

diff --git a/retro_data_structures/formats/script_object.py b/retro_data_structures/formats/script_object.py
@@ -22,7 +22,6 @@
  Int32ub,
  PrefixedArray,
  Struct,
- Union,
 )
 
 from retro_data_structures import game_check, properties

diff --git a/test/formats/test_mrea.py b/test/formats/test_mrea.py
@@ -3,7 +3,6 @@
 import pytest
 
 from retro_data_structures.base_resource import AssetId
-from retro_data_structures.formats import Mlvl
 from retro_data_structures.formats.mrea import Mrea
 from retro_data_structures.formats.script_object import ScriptInstance
 

diff --git a/test/formats/test_script_api.py b/test/formats/test_script_api.py
@@ -3,7 +3,7 @@
 import retro_data_structures.enums.echoes as _echoes_enums
 import retro_data_structures.enums.prime as _prime_enums
 from retro_data_structures.formats import script_object
-from retro_data_structures.formats.mlvl import Mlvl, Area
+from retro_data_structures.formats.mlvl import Area, Mlvl
 from retro_data_structures.formats.script_object import InstanceId