Merge 3279035 into e349494

seanbudd · web-flow · commit 3b408a8db9c1 · 2023-08-04T12:50:00.000+10:00
diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py
@@ -621,7 +621,7 @@ def runInstallTask(self,taskName,*args,**kwargs):
 			if func:
 				func(*args,**kwargs)
 
-	def getDocFilePath(self, fileName=None):
+	def getDocFilePath(self, fileName: Optional[str] = None) -> Optional[str]:
 		r"""Get the path to a documentation file for this add-on.
 		The file should be located in C{doc\lang\file} inside the add-on,
 		where C{lang} is the language code and C{file} is the requested file name.
@@ -630,9 +630,7 @@ def getDocFilePath(self, fileName=None):
 		An add-on can specify a default documentation file name
 		via the docFileName parameter in its manifest.
 		@param fileName: The requested file name or C{None} for the add-on's default.
-		@type fileName: str
 		@return: The path to the requested file or C{None} if it wasn't found.
-		@rtype: str
 		"""
 		if not fileName:
 			fileName = self.manifest["docFileName"]
diff --git a/source/gui/_addonStoreGui/viewModels/store.py b/source/gui/_addonStoreGui/viewModels/store.py
@@ -201,11 +201,16 @@ def _makeActionsList(self):
 				# Translators: Label for an action that opens help for the selected addon
 				displayName=pgettext("addonStore", "&Help"),
 				actionHandler=self.helpAddon,
-				validCheck=lambda aVM: aVM.model.isInstalled and self._filteredStatusKey in (
-					# Showing help in the updatable add-ons view is misleading
-					# as we can only fetch the add-on help from the installed version.
-					_StatusFilterKey.INSTALLED,
-					_StatusFilterKey.INCOMPATIBLE,
+				validCheck=lambda aVM: (
+					aVM.model.isInstalled
+					and self._filteredStatusKey in (
+						# Showing help in the updatable add-ons view is misleading
+						# as we can only fetch the add-on help from the installed version.
+						_StatusFilterKey.INSTALLED,
+						_StatusFilterKey.INCOMPATIBLE,
+					)
+					and aVM.model._addonHandlerModel is not None
+					and aVM.model._addonHandlerModel.getDocFilePath() is not None
 				),
 				listItemVM=selectedListItem
 			),
@@ -236,7 +241,9 @@ def _makeActionsList(self):
 		]
 
 	def helpAddon(self, listItemVM: AddonListItemVM) -> None:
+		assert listItemVM.model._addonHandlerModel is not None
 		path = listItemVM.model._addonHandlerModel.getDocFilePath()
+		assert path is not None
 		startfile(path)
 
 	def removeAddon(self, listItemVM: AddonListItemVM) -> None:
