Fix to work with 2025.1

* fix type annotation addition (don't add type when setting a global var)
* fix type annotation for callable
* ProsodyCommand -> BaseProsodyCommand

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCAT.py

@@ -48,7 +48,7 @@
 	CharacterModeCommand,
 	PhonemeCommand,
 	IndexCommand,
-	ProsodyCommand,
+	BaseProsodyCommand,
 	SpeechCommand,
 	SynthCommand,
 )
@@ -79,7 +79,7 @@
 	r"|(?P<content>[^<]+)",
 )
 
-PROSODY_COMMANDS: dict[str, ProsodyCommand] = {
+PROSODY_COMMANDS: dict[str, BaseProsodyCommand] = {
 	"pitch": PitchCommand,
 	"volume": VolumeCommand,
 	"rate": RateCommand,
@@ -169,7 +169,7 @@ def convertSSMLTextForNVDA(text: str) -> list[str | SpeechCommand]:
 	if language != nvdaLanguage:
 		out.append(LangChangeCommand(language))
 
-	resetProsody: list[Type["ProsodyCommand"]] = []
+	resetProsody: list[Type["BaseProsodyCommand"]] = []
 	# log.info(f"\ntext: {text}")
 	for m in RE_MATHML_SPEECH.finditer(text):
 		if m.lastgroup == "break":
@@ -188,13 +188,13 @@ def convertSSMLTextForNVDA(text: str) -> list[str | SpeechCommand]:
 				out.append(PitchCommand(multiplier=int(m.group(m.lastgroup))))
 				resetProsody.append(PitchCommand)
 		elif m.lastgroup in PROSODY_COMMANDS:
-			command: Type["ProsodyCommand"] = PROSODY_COMMANDS[m.lastgroup]
+			command: Type["BaseProsodyCommand"] = PROSODY_COMMANDS[m.lastgroup]
 			if command in supportedCommands:
 				out.append(command(multiplier=int(m.group(m.lastgroup)) / 100.0))
 				resetProsody.append(command)
 		elif m.lastgroup == "prosodyReset":
 			# for command in resetProsody:    # only supported commands were added, so no need to check
-			command: Type["ProsodyCommand"] = resetProsody.pop()
+			command: Type["BaseProsodyCommand"] = resetProsody.pop()
 			out.append(command(multiplier=1))
 		elif m.lastgroup == "phonemeText":
 			if usePhoneme:
@@ -293,7 +293,7 @@ def getBrailleRegions(
 	def getScript(
 		self,
 		gesture: KeyboardInputGesture,
-	) -> Callable[KeyboardInputGesture, None] | None:
+	) -> Callable[[KeyboardInputGesture], None] | None:
 		"""
 		Returns the script function bound to the given gesture.
 
@@ -550,7 +550,7 @@ def getSpeechForMathMl(
 		synth: SynthDriver = getSynth()
 		synthConfig = config.conf["speech"][synth.name]
 		if synth.name == "espeak":
-			_synthesizerRate: int = synthConfig["rate"]
+			_synthesizerRate = synthConfig["rate"]
 			# log.info(f'_synthesizer_rate={_synthesizer_rate}, get_rate()={getSynth()._get_rate()}')
 			getSynth()._set_rate(_synthesizerRate)
 		# log.info(f'..............get_rate()={getSynth()._get_rate()}, name={synth.name}')