Typing changes for backward compatibility

Author: arandomdev

bin/dyldex_all

@@ -254,7 +254,7 @@ def _main() -> None:
 		loggingLevel = logging.DEBUG
 
 	# create a list of image paths
-	imagePaths: list[str] = []
+	imagePaths: List[str] = []
 	with open(args.dyld_path, "rb") as f:
 		dyldFileCtx = FileContext(f)
 		dyldCtx = DyldContext(dyldFileCtx)
@@ -269,7 +269,7 @@ def _main() -> None:
 
 	with multiprocessing.Pool(initializer=_workerInitializer) as pool:
 		# Create a job for each image
-		jobs: list[tuple[str, multiprocessing.pool.AsyncResult]] = []
+		jobs: List[Tuple[str, multiprocessing.pool.AsyncResult]] = []
 		jobsComplete = 0
 		for i, imagePath in enumerate(imagePaths):
 			# The index should correspond with its index in the DSC
@@ -284,7 +284,7 @@ def _main() -> None:
 		)
 
 		# Record potential logging output for each job
-		jobOutputs: list[str] = []
+		jobOutputs: List[str] = []
 
 		# wait for all jobs
 		while len(jobs):

src/DyldExtractor/converter/linkedit_optimizer.py

@@ -1,5 +1,5 @@
 import struct
-from typing import Union, Type
+from typing import Union, Type, Dict
 
 from DyldExtractor.extraction_context import ExtractionContext
 
@@ -30,7 +30,7 @@ def __init__(self) -> None:
 
 		self.symbolsSize = 0
 
-		self._stringMap: dict[bytes, int] = {}
+		self._stringMap: Dict[bytes, int] = {}
 		self._stringLength = 0
 
 		# first string is \x00 historically
@@ -109,7 +109,7 @@ def __init__(self, extractionCtx: ExtractionContext) -> None:
 
 		# Maps the old symbol indexes in the shared symbol table
 		# 	to the new indexes in the optimized index table.
-		self.oldToNewSymbolIndexes: dict[int, int] = {}
+		self.oldToNewSymbolIndexes: Dict[int, int] = {}
 
 		self.newWeakBindingInfoOffset = 0
 		self.newLazyBindingInfoOffset = 0

src/DyldExtractor/converter/objc_fixer.py

@@ -99,7 +99,7 @@ def __init__(
 		# All the instructions in the text section.
 		# The instruction at index 0 corresponds to
 		# the first instruction.
-		self._textInstr: tuple[int, str, tuple[str]] = None
+		self._textInstr: Tuple[int, str, Tuple[str]] = None
 		pass
 
 	def run(self) -> None:
@@ -1156,7 +1156,7 @@ def _processMethodList(self, methodListAddr: int, noImp=False) -> int:
 
 		# fix relative pointers after we reserve a new address for the method list
 		# contains a list of tuples of field offsets and their target addresses
-		relativeFixups: list[tuple[int, int]] = []
+		relativeFixups: List[Tuple[int, int]] = []
 		for i in range(methodListDef.count):
 			methodAddr = (
 				methodListAddr

src/DyldExtractor/converter/stub_fixer.py

@@ -48,10 +48,10 @@ def __init__(self, extractionCtx: ExtractionContext) -> None:
 		self._logger = extractionCtx.logger
 
 		# Stores and address and the possible symbols at the address
-		self._symbolCache: dict[int, list[bytes]] = {}
+		self._symbolCache: Dict[int, List[bytes]] = {}
 
 		# create a map of image paths and their addresses
-		self._images: dict[bytes, int] = {}
+		self._images: Dict[bytes, int] = {}
 		for image in self._dyldCtx.images:
 			imagePath = self._dyldCtx.fileCtx.readString(image.pathFileOffset)
 			self._images[imagePath] = image.address
@@ -94,7 +94,7 @@ def _enumerateExports(self) -> None:
 
 		# These exports sometimes change the name of an existing
 		# export symbol. We have to process them last.
-		reExports: list[dyld_trie.ExportInfo] = []
+		reExports: List[dyld_trie.ExportInfo] = []
 
 		# get an initial list of dependencies
 		if dylibs := self._machoCtx.getLoadCommand(DEP_LCS, multiple=True):

src/DyldExtractor/dyld/dyld_context.py

@@ -101,7 +101,7 @@ def hasSubCaches(self) -> bool:
 		else:
 			return False
 
-	def addSubCaches(self, subCacheFileCtxs: list[FileContext]) -> None:
+	def addSubCaches(self, subCacheFileCtxs: List[FileContext]) -> None:
 		cacheClass = type(self)
 		for fileCtx in subCacheFileCtxs:
 			subCache = cacheClass(fileCtx)

tests/run_all_images_multiprocess.py

@@ -174,7 +174,7 @@ def _workerInitializer():
 	args = parser.parse_args(namespace=_DyldExtractorArgs)
 
 	# create a list of images
-	images: list[str] = []
+	images: List[str] = []
 	with open(args.dyld_path, "rb") as f:
 		dyldFileCtx = FileContext(f)
 		dyldCtx = DyldContext(dyldFileCtx)
@@ -190,7 +190,7 @@ def _workerInitializer():
 	summary = ""
 	with mp.Pool(args.jobs, initializer=_workerInitializer) as pool:
 		# create jobs for each image
-		jobs: list[tuple[str, mp.pool.AsyncResult]] = []
+		jobs: List[Tuple[str, mp.pool.AsyncResult]] = []
 		for index, imageName in enumerate(images):
 			jobs.append(
 				(imageName, pool.apply_async(_imageRunner, (args.dyld_path, index)))