Annotations: annotate containers properly. Re #155.

Annotate containers, including find text, cart edit timestamp used in cart explorer, and config profile status map.

addon/appModules/splstudio/__init__.py

@@ -14,7 +14,7 @@
 
 # #155 (21.03): remove __future__ import when NVDA runs under Python 3.10.
 from __future__ import annotations
-from typing import Any
+from typing import Any, Optional
 from functools import wraps
 import os
 import time
@@ -1378,7 +1378,8 @@ def script_setBrailleTimer(self, gesture):
 	# 6.0: Split this routine into two functions, with the while loop moving to a function of its own.
 	# This new function will be used by track finder and place marker locator.
 	# 17.08: now it is a list that records search history.
-	findText = None
+	# 21.03: accept both None and str because it will be filtered to remove None anyway.
+	findText: Optional[list[Optional[str]]] = None
 
 	def trackFinder(self, text, obj, directionForward=True, column=None):
 		speech.cancelSpeech()

addon/appModules/splstudio/splconfig.py

@@ -685,7 +685,7 @@ def swapProfiles(self, prevProfile, newProfile, showSwitchIndex=False):
 # To be run in app module constructor.
 # With the load function below, prepare config and other things upon request.
 # Prompt the config error dialog only once.
-_configLoadStatus = {}  # Key = filename, value is pass or no pass.
+_configLoadStatus: dict[str, str] = {}  # Key = filename, value is pass or no pass.
 # Track comments map.
 trackComments = {}
 

addon/appModules/splstudio/splmisc.py

@@ -4,6 +4,8 @@
 # Miscellaneous functions and user interfaces
 # Split from config module in 2015.
 
+# #155 (21.03): remove __future__ import when NVDA runs under Python 3.10.
+from __future__ import annotations
 import weakref
 import os
 import threading
@@ -306,7 +308,7 @@ def _populateCarts(carts, cartlst, modifier, standardEdition=False, refresh=Fals
 
 
 # Cart file timestamps.
-_cartEditTimestamps = []
+_cartEditTimestamps: list[float] = []
 
 
 # Initialize Cart Explorer i.e. fetch carts.