some worlds: some typing in LocalRom

worlds/alttp/Rom.py

@@ -18,7 +18,7 @@
 import threading
 import concurrent.futures
 import bsdiff4
-from typing import Optional, List
+from typing import Collection, Optional, List, SupportsIndex
 
 from BaseClasses import CollectionState, Region, Location, MultiWorld
 from Utils import local_path, user_path, int16_as_bytes, int32_as_bytes, snes_to_pc, is_frozen, parse_yaml, read_snes_rom
@@ -52,7 +52,7 @@
 enemizer_logger = logging.getLogger("Enemizer")
 
 
-class LocalRom(object):
+class LocalRom:
 
     def __init__(self, file, patch=True, vanillaRom=None, name=None, hash=None):
         self.name = name
@@ -71,13 +71,13 @@ def __init__(self, file, patch=True, vanillaRom=None, name=None, hash=None):
     def read_byte(self, address: int) -> int:
         return self.buffer[address]
 
-    def read_bytes(self, startaddress: int, length: int) -> bytes:
+    def read_bytes(self, startaddress: int, length: int) -> bytearray:
         return self.buffer[startaddress:startaddress + length]
 
     def write_byte(self, address: int, value: int):
         self.buffer[address] = value
 
-    def write_bytes(self, startaddress: int, values):
+    def write_bytes(self, startaddress: int, values: Collection[SupportsIndex]) -> None:
         self.buffer[startaddress:startaddress + len(values)] = values
 
     def encrypt_range(self, startaddress: int, length: int, key: bytes):

worlds/dkc3/Rom.py

@@ -434,7 +434,7 @@
     0x21,
 ]
 
-class LocalRom(object):
+class LocalRom:
 
     def __init__(self, file, patch=True, vanillaRom=None, name=None, hash=None):
         self.name = name
@@ -457,7 +457,7 @@ def read_bit(self, address: int, bit_number: int) -> bool:
     def read_byte(self, address: int) -> int:
         return self.buffer[address]
 
-    def read_bytes(self, startaddress: int, length: int) -> bytes:
+    def read_bytes(self, startaddress: int, length: int) -> bytearray:
         return self.buffer[startaddress:startaddress + length]
 
     def write_byte(self, address: int, value: int):

worlds/smw/Rom.py

@@ -83,7 +83,7 @@ def read_bit(self, address: int, bit_number: int) -> bool:
     def read_byte(self, address: int) -> int:
         return self.buffer[address]
 
-    def read_bytes(self, startaddress: int, length: int) -> bytes:
+    def read_bytes(self, startaddress: int, length: int) -> bytearray:
         return self.buffer[startaddress:startaddress + length]
 
     def write_byte(self, address: int, value: int):

worlds/yoshisisland/Rom.py

@@ -3,7 +3,7 @@
 import Utils
 from worlds.Files import APDeltaPatch
 from settings import get_settings
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Collection, SupportsIndex
 
 from .Options import YoshiColors, BowserDoor, PlayerGoal, MinigameChecks
 
@@ -396,7 +396,7 @@
     0x30510B: [0x14B2, 4]
 }
 
-class LocalRom(object):
+class LocalRom:
 
     def __init__(self, file: str) -> None:
         self.name = None
@@ -413,13 +413,13 @@ def read_bit(self, address: int, bit_number: int) -> bool:
     def read_byte(self, address: int) -> int:
         return self.buffer[address]
 
-    def read_bytes(self, startaddress: int, length: int) -> bytes:
+    def read_bytes(self, startaddress: int, length: int) -> bytearray:
         return self.buffer[startaddress:startaddress + length]
 
     def write_byte(self, address: int, value: int) -> None:
         self.buffer[address] = value
 
-    def write_bytes(self, startaddress: int, values: bytearray) -> None:
+    def write_bytes(self, startaddress: int, values: Collection[SupportsIndex]) -> None:
         self.buffer[startaddress:startaddress + len(values)] = values
 
     def write_to_file(self, file: str) -> None: