speechlight 2.0.2__tar.gz → 3.0.0__tar.gz

{speechlight-2.0.2 → speechlight-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: speechlight
-Version: 2.0.2
+Version: 3.0.0
 Summary: A lightweight Python library providing a common interface to multiple TTS and screen reader APIs.
 Keywords: blind,braille,screen reader,tts,speech,accessibility,jaws,nvda,sapi,system access
 Author-Email: Nick Stockton <nstockton@users.noreply.github.com>
@@ -11,11 +11,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: MacOS
@@ -34,10 +34,10 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Project-URL: homepage, https://github.com/nstockton/speechlight
 Project-URL: repository, https://github.com/nstockton/speechlight
 Project-URL: documentation, https://nstockton.github.io/speechlight
-Requires-Python: <4.0,>=3.9
+Requires-Python: <4.0,>=3.10
 Requires-Dist: knickknacks<1.0.0,>=0.6.0
-Requires-Dist: pyobjc<11.0,>=10.0; sys_platform == "darwin"
-Requires-Dist: pywin32<400,>=306; sys_platform == "win32"
+Requires-Dist: pyobjc<13.0,>=12.0; sys_platform == "darwin"
+Requires-Dist: pywin32<400,>=311; sys_platform == "win32"
 Description-Content-Type: text/markdown
 
 # Speechlight

{speechlight-2.0.2 → speechlight-3.0.0}/pyproject.toml

@@ -11,11 +11,11 @@ authors = [
 ]
 description = "A lightweight Python library providing a common interface to multiple TTS and screen reader APIs."
 readme = "README.md"
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 dependencies = [
     "knickknacks>=0.6.0,<1.0.0",
-    "pyobjc>=10.0,<11.0; sys_platform == \"darwin\"",
-    "pywin32>=306,<400; sys_platform == \"win32\"",
+    "pyobjc>=12.0,<13.0; sys_platform == \"darwin\"",
+    "pywin32>=311,<400; sys_platform == \"win32\"",
 ]
 dynamic = []
 keywords = [
@@ -37,11 +37,11 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation",
     "Programming Language :: Python :: Implementation :: CPython",
     "Operating System :: MacOS",
@@ -58,7 +58,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-version = "2.0.2"
+version = "3.0.0"
 
 [project.license]
 text = "MIT"

speechlight-3.0.0/src/speechlight/_version.py

@@ -0,0 +1 @@
+__version__: str = "3.0.0"

{speechlight-2.0.2 → speechlight-3.0.0}/src/speechlight/windows.py

@@ -25,8 +25,9 @@ from __future__ import annotations
 
 # Built-in Modules:
 import ctypes
+import re
+import shutil
 import sys
-from contextlib import suppress
 from typing import Any, Optional
 
 # Local Modules:
@@ -35,7 +36,6 @@ from .base import BaseSpeech
 
 
 if sys.platform == "win32":  # pragma: no cover
-	import win32com.client
 	from pywintypes import com_error as ComError  # NOQA: N812
 
 
@@ -45,6 +45,51 @@ SPF_PURGE_BEFORE_SPEAK: int = 2  # Purges all pending speak requests prior to th
 SPF_IS_NOT_XML: int = 16  # The input text will not be parsed for XML markup.
 
 
+def dispatch(*args: Any, **kwargs: Any) -> Any:  # pragma: no cover
+	"""
+	Calls win32com.client.Dispatch with the supplied arguments.
+
+	If the call fails, then an attempt is made to clear the cache and try again.
+
+	Note:
+		https://stackoverflow.com/questions/33267002/why-am-i-suddenly-getting-a-no-attribute-clsidtopackagemap-error-with-win32com
+
+	Args:
+			*args: Positional arguments to be passed to win32com.client.Dispatch.
+			**kwargs: Key-word only arguments to be passed to win32com.client.Dispatch.
+
+	Returns:
+		The resulting COM reference.
+	"""
+	app = None
+	if sys.platform == "win32":
+		try:
+			from win32com import client  # NOQA: PLC0415
+
+			app = client.Dispatch(*args, **kwargs)
+		except AttributeError:
+			# Remove cache and try again.
+			from win32com.client import gencache  # NOQA: PLC0415
+
+			if not hasattr(gencache, "GetGeneratePath"):
+				return None
+			cache_location = gencache.GetGeneratePath()
+			del gencache
+			modules = [m.__name__ for m in sys.modules.values()]
+			for module in modules:
+				if re.match(r"win32com\.(?:gen_py|client)\..+", module):
+					del sys.modules[module]
+			if "gen_py" in cache_location:
+				shutil.rmtree(cache_location, ignore_errors=True)
+			from win32com import client  # NOQA: PLC0415
+
+			app = client.Dispatch(*args, **kwargs)
+		except ComError:
+			return None
+		del client
+	return app
+
+
 class Speech(BaseSpeech):  # NOQA: PLR0904
 	"""Implements Speech for Windows."""
 
@@ -73,17 +118,13 @@ class Speech(BaseSpeech):  # NOQA: PLR0904
 	@property
 	def sapi(self) -> Any:  # type: ignore[misc] # pragma: no cover
 		"""The SAPI COM object."""
-		if sys.platform == "win32":
-			with suppress(ComError):
-				self._sapi = win32com.client.Dispatch("SAPI.SpVoice")
+		self._sapi = dispatch("SAPI.SpVoice")
 		return self._sapi
 
 	@property
 	def jfw(self) -> Any:  # type: ignore[misc] # pragma: no cover
 		"""The JFW COM object."""
-		if sys.platform == "win32":
-			with suppress(ComError):
-				self._jfw = win32com.client.Dispatch("FreedomSci.JawsApi")
+		self._jfw = dispatch("FreedomSci.JawsApi")
 		return self._jfw
 
 	def jfw_braille(self, text: str) -> None: