isort

test/MysteryTestSuite.py

@@ -1,9 +1,9 @@
+import argparse
+import concurrent.futures
+import multiprocessing
 import os
 import subprocess
 import sys
-import multiprocessing
-import concurrent.futures
-import argparse
 from collections import OrderedDict
 
 cpu_threads = multiprocessing.cpu_count()

test/NewTestSuite.py

@@ -1,10 +1,10 @@
+import argparse
+import concurrent.futures
 import fnmatch
+import multiprocessing
 import os
 import subprocess
 import sys
-import multiprocessing
-import concurrent.futures
-import argparse
 from collections import OrderedDict
 
 cpu_threads = multiprocessing.cpu_count()

test/dungeons/TestDungeon.py

@@ -1,12 +1,12 @@
 import unittest
 
-from BaseClasses import World, CollectionState
+from BaseClasses import CollectionState, World
 from Dungeons import create_dungeons, get_dungeon_item_pool
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from Regions import create_regions
 from Rules import set_rules
-from source.overworld.EntranceShuffle2 import mandatory_connections, connect_simple
+from source.overworld.EntranceShuffle2 import connect_simple, mandatory_connections
 
 
 class TestDungeon(unittest.TestCase):

test/inverted/TestInverted.py

@@ -1,16 +1,21 @@
+from test.TestBase import TestBase
+
 from BaseClasses import World
-from DoorShuffle import link_doors
 from Doors import create_doors
+from DoorShuffle import link_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
-from OverworldShuffle import link_overworld
-from ItemList import generate_itempool, difficulties
+from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
-from Regions import create_regions, mark_light_dark_world_regions, create_dungeon_regions, create_shops
+from OverworldShuffle import link_overworld
+from Regions import (
+    create_dungeon_regions,
+    create_regions,
+    create_shops,
+    mark_light_dark_world_regions,
+)
 from RoomData import create_rooms
 from Rules import set_rules
-
 from source.overworld.EntranceShuffle2 import link_entrances_new
-from test.TestBase import TestBase
 
 
 class TestInverted(TestBase):

test/inverted/TestInvertedBombRules.py

@@ -1,14 +1,29 @@
 import unittest
+from test.inverted.TestInverted import TestInverted
 
 from BaseClasses import World
 from Dungeons import create_dungeons
-# todo: this test needs to be rewritten unfortunately
-from source.overworld.EntranceShuffle2 import connect_entrance, Inverted_LW_Entrances, Inverted_LW_Dungeon_Entrances, Inverted_LW_Single_Cave_Doors, Inverted_Old_Man_Entrances, Inverted_DW_Entrances, Inverted_DW_Dungeon_Entrances, Inverted_DW_Single_Cave_Doors, \
-    Inverted_LW_Entrances_Must_Exit, Inverted_LW_Dungeon_Entrances_Must_Exit, Inverted_Bomb_Shop_Multi_Cave_Doors, Inverted_Bomb_Shop_Single_Cave_Doors, Inverted_Blacksmith_Single_Cave_Doors, Inverted_Blacksmith_Multi_Cave_Doors
-from Regions import create_regions
 from ItemList import difficulties
+from Regions import create_regions
 from Rules import set_inverted_big_bomb_rules
-from test.inverted.TestInverted import TestInverted
+
+# todo: this test needs to be rewritten unfortunately
+from source.overworld.EntranceShuffle2 import (
+    Inverted_Blacksmith_Multi_Cave_Doors,
+    Inverted_Blacksmith_Single_Cave_Doors,
+    Inverted_Bomb_Shop_Multi_Cave_Doors,
+    Inverted_Bomb_Shop_Single_Cave_Doors,
+    Inverted_DW_Dungeon_Entrances,
+    Inverted_DW_Entrances,
+    Inverted_DW_Single_Cave_Doors,
+    Inverted_LW_Dungeon_Entrances,
+    Inverted_LW_Dungeon_Entrances_Must_Exit,
+    Inverted_LW_Entrances,
+    Inverted_LW_Entrances_Must_Exit,
+    Inverted_LW_Single_Cave_Doors,
+    Inverted_Old_Man_Entrances,
+    connect_entrance,
+)
 
 
 class TestInvertedBombRules(TestInverted):

test/inverted_owg/TestDungeons.py

@@ -1,5 +1,6 @@
 from test.inverted_owg.TestInvertedOWG import TestInvertedOWG
 
+
 class TestDungeons(TestInvertedOWG):
 
     def testFirstDungeonChests(self):

test/inverted_owg/TestInvertedOWG.py

@@ -1,16 +1,22 @@
+from test.TestBase import TestBase
+
 from BaseClasses import World
-from DoorShuffle import link_doors
 from Doors import create_doors
+from DoorShuffle import link_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
-from OverworldShuffle import link_overworld
-from source.overworld.EntranceShuffle2 import link_entrances_new
-from ItemList import generate_itempool, difficulties
+from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from OverworldGlitchRules import create_owg_connections
-from Regions import create_regions, mark_light_dark_world_regions, create_dungeon_regions, create_shops
+from OverworldShuffle import link_overworld
+from Regions import (
+    create_dungeon_regions,
+    create_regions,
+    create_shops,
+    mark_light_dark_world_regions,
+)
 from RoomData import create_rooms
 from Rules import set_rules
-from test.TestBase import TestBase
+from source.overworld.EntranceShuffle2 import link_entrances_new
 
 
 class TestInvertedOWG(TestBase):

test/owg/TestVanillaOWG.py

@@ -1,16 +1,22 @@
+from test.TestBase import TestBase
+
 from BaseClasses import World
-from DoorShuffle import link_doors
 from Doors import create_doors
+from DoorShuffle import link_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
-from OverworldShuffle import link_overworld
-from source.overworld.EntranceShuffle2 import link_entrances_new
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from OverworldGlitchRules import create_owg_connections
-from Regions import create_regions, create_dungeon_regions, create_shops, mark_light_dark_world_regions
+from OverworldShuffle import link_overworld
+from Regions import (
+    create_dungeon_regions,
+    create_regions,
+    create_shops,
+    mark_light_dark_world_regions,
+)
 from RoomData import create_rooms
 from Rules import set_rules
-from test.TestBase import TestBase
+from source.overworld.EntranceShuffle2 import link_entrances_new
 
 
 class TestVanillaOWG(TestBase):

test/stats/EntranceShuffleStats.py

@@ -1,16 +1,16 @@
 import os
 import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
-import RaceRandom as random
-import time
 
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
+import time
 from collections import Counter, defaultdict
 
-from source.overworld.EntranceShuffle2 import link_entrances_new
+import RaceRandom as random
+
 # from source.oEntranceShuffle import link_entrances_new
 from BaseClasses import World
-from Regions import create_regions, create_dungeon_regions
-
+from Regions import create_dungeon_regions, create_regions
+from source.overworld.EntranceShuffle2 import link_entrances_new
 
 # probably deprecated
 

test/vanilla/TestVanilla.py

@@ -1,15 +1,21 @@
+from test.TestBase import TestBase
+
 from BaseClasses import World
-from DoorShuffle import link_doors
 from Doors import create_doors
+from DoorShuffle import link_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
-from OverworldShuffle import link_overworld
-from source.overworld.EntranceShuffle2 import link_entrances_new
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
-from Regions import create_regions, create_dungeon_regions, create_shops, mark_light_dark_world_regions
+from OverworldShuffle import link_overworld
+from Regions import (
+    create_dungeon_regions,
+    create_regions,
+    create_shops,
+    mark_light_dark_world_regions,
+)
 from RoomData import create_rooms
 from Rules import set_rules
-from test.TestBase import TestBase
+from source.overworld.EntranceShuffle2 import link_entrances_new
 
 
 class TestVanilla(TestBase):