From 95745454e9a03e3766dae140e1cf512a23e28318 Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Wed, 24 Jan 2024 14:26:53 -0800
Subject: [PATCH] More type annotations fixes for old Python versions

---
 retail_progress.py             | 13 +++++++------
 tools/disasm/file_addresses.py |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/retail_progress.py b/retail_progress.py
index 9ca9cfbe69..af15af0675 100755
--- a/retail_progress.py
+++ b/retail_progress.py
@@ -12,15 +12,16 @@ from pathlib import Path
 import re
 import subprocess
 import sys
+from typing import List, Optional, Tuple
 
 @dataclass
 class Inst:
     func_name: str
     mnemonic: str
-    regs: list[str]
-    imm: int|None
-    reloc_type: str|None
-    reloc_symbol: str|None
+    regs: List[str]
+    imm: Optional[int]
+    reloc_type: Optional[str]
+    reloc_symbol: Optional[str]
 
 FUNC_RE = re.compile(r"([0-9a-f]+) <(.*)>:")
 
@@ -59,7 +60,7 @@ def parse_inst(func_name: str, line: str) -> Inst:
                     regs.append(part)
     return Inst(func_name, mnemonic, regs, imm, None, None)
 
-def run_objdump(path: Path) -> list[Inst]:
+def run_objdump(path: Path) -> List[Inst]:
     if not path.exists():
         raise Exception(f"file {path} does not exist")
 
@@ -113,7 +114,7 @@ def run_objdump(path: Path) -> list[Inst]:
         result.pop()
     return result
 
-def pair_instructions(insts1: list[Inst], insts2: list[Inst]) -> Iterator[tuple[Inst|None, Inst|None]]:
+def pair_instructions(insts1: List[Inst], insts2: List[Inst]) -> Iterator[Tuple[Inst|None, Inst|None]]:
     differ = difflib.SequenceMatcher(
         a=[(inst.func_name, inst.mnemonic) for inst in insts1],
         b=[(inst.func_name, inst.mnemonic) for inst in insts2],
diff --git a/tools/disasm/file_addresses.py b/tools/disasm/file_addresses.py
index 2e21f20087..28940c3d8b 100644
--- a/tools/disasm/file_addresses.py
+++ b/tools/disasm/file_addresses.py
@@ -1,7 +1,7 @@
 import csv
 from dataclasses import dataclass
 from pathlib import Path
-import typing
+from typing import List, Optional
 
 @dataclass
 class DmaFile:
@@ -10,10 +10,10 @@ class DmaFile:
     vrom_end: int
     rom_start: int
     rom_end: int
-    overlay_vram_start: typing.Optional[int]
-    overlay_dir: typing.Optional[str]
+    overlay_vram_start: Optional[int]
+    overlay_dir: Optional[str]
 
-def parse_file_addresses(path: Path) -> typing.List[DmaFile]:
+def parse_file_addresses(path: Path) -> List[DmaFile]:
     result = []
     with open(path) as f:
         reader = csv.DictReader(f)