Remove legacy compatibility code for NVDA < 2024.1

- Remove NVDA version checks (buildVersion / NVDA_VERSION < "2023.2")
- Remove dead code for NVDA 2014.4 (searchTag_2014, nextTag, previousTag, searchTag wrapper)
- Remove Python version_info < 9 guards, use collections.abc directly
- Remove unnecessary try/except imports (json, VBuf_getTextInRange)
- Remove hasattr guard for addon.isDisabled (available since NVDA 2016.3)
- Clean up unused imports (sys, virtualBuffers, NVDAHelper, buildVersion)

Author: AAClause

addon/globalPlugins/webAccess/__init__.py

@@ -65,7 +65,6 @@
 import addonHandler
 import api
 import baseObject
-from buildVersion import version_detailed as NVDA_VERSION
 import controlTypes
 import core
 import eventHandler
@@ -356,12 +355,7 @@ def script_showWebAccessSettings(self, gesture):  # @UnusedVariable
 		# After the above import, it appears that the `gui` name now points to the `.gui` module
 		# rather than NVDA's `gui`… No clue why…
 		import gui
-		if NVDA_VERSION < "2023.2":
-			# Deprecated as of NVDA 2023.2
-			gui.mainFrame._popupSettingsDialog(WebAccessSettingsDialog)
-		else:
-			# Now part of the public API as of NVDA PR #15121
-			gui.mainFrame.popupSettingsDialog(WebAccessSettingsDialog)
+		gui.mainFrame.popupSettingsDialog(WebAccessSettingsDialog)
 
 	@script(
 		# Translators: Input help mode message for a WebAccess command

addon/globalPlugins/webAccess/gui/__init__.py

@@ -28,12 +28,10 @@
 
 
 from abc import abstractmethod
-from buildVersion import version_detailed as NVDA_VERSION
 from collections import OrderedDict
 from dataclasses import dataclass
 from enum import Enum, auto
 import re
-import sys
 from typing import Any, Callable
 import wx
 import wx.lib.mixins.listctrl as listmix
@@ -61,11 +59,7 @@
 # Fall back to wx.lib.scrolledpanel.ScrolledPanel which now has the fix built-in.
 _TabbableScrolledPanel = getattr(nvdaControls, "TabbableScrolledPanel", ScrolledPanel)
 
-
-if sys.version_info[1] < 9:
-    from typing import Iterable, Mapping, Sequence, Set
-else:
-    from collections.abc import Iterable, Mapping, Sequence, Set
+from collections.abc import Iterable, Mapping, Sequence, Set
 
 
 addonHandler.initTranslation()
@@ -256,7 +250,7 @@ def _buildGui(self):
 		self.SetSizer(self.mainSizer)
 
 
-# TODO: Consider migrating to NVDA's SettingsDialog once we hit 2023.2 as minimum version 
+# TODO: Consider migrating to NVDA's SettingsDialog
 class ContextualDialog(ScalingMixin, wx.Dialog):
 
 	def initData(self, context):
@@ -372,12 +366,9 @@ def configuredSettingsDialogType(hasApplyButton: bool) -> type(SettingsDialog):
 	class Type(SettingsDialog):
 
 		def __init__(self, *args, **kwargs):
-			if NVDA_VERSION < "2023.2":
-				kwargs["hasApplyButton"] = hasApplyButton
-			else:
-				buttons: Set[int] = kwargs.get("buttons", {wx.OK, wx.CANCEL})
-				if not hasApplyButton:
-					buttons -= {wx.APPLY}
+			buttons: Set[int] = kwargs.get("buttons", {wx.OK, wx.CANCEL})
+			if not hasApplyButton:
+				buttons -= {wx.APPLY}
 			super().__init__(*args, **kwargs)
 
 	return Type

addon/globalPlugins/webAccess/gui/rule/__init__.py

@@ -23,7 +23,6 @@
 __author__ = "Julien Cochuyt <j.cochuyt@accessolutions.fr>"
 
 
-import sys
 from typing import Any
 
 import wx
@@ -37,11 +36,7 @@
 from ...utils import updateOrDrop
 from .properties import Properties
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping
-else:
-    from collections.abc import Mapping
+from collections.abc import Mapping
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/criteriaEditor.py

@@ -33,7 +33,6 @@
 from collections import OrderedDict
 from copy import deepcopy
 import re
-import sys
 from typing import Any
 import wx
 from wx.lib.expando import EVT_ETC_LAYOUT_NEEDED, ExpandoTextCtrl
@@ -66,11 +65,7 @@
 from .gestures import GesturesPanelBase
 from .properties import Properties, PropertiesPanelBase, Property
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping, Sequence
-else:
-    from collections.abc import Mapping, Sequence
+from collections.abc import Mapping, Sequence
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/editor.py

@@ -35,7 +35,6 @@
 from dataclasses import dataclass
 from enum import Enum
 from functools import partial
-import sys
 from typing import Any
 import wx
 from wx.lib.expando import EVT_ETC_LAYOUT_NEEDED, ExpandoTextCtrl
@@ -80,11 +79,7 @@
 	SinglePropertyEditorPanelBase,
 )
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping, Sequence
-else:
-    from collections.abc import Mapping, Sequence
+from collections.abc import Mapping, Sequence
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/gestureBinding.py

@@ -30,7 +30,6 @@
 )
 
 
-import sys
 from typing import Any
 import wx
 
@@ -45,11 +44,7 @@
 from ...utils import guarded, logException
 from .. import ScalingMixin, showContextualDialog
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping
-else:
-    from collections.abc import Mapping
+from collections.abc import Mapping
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/gestures.py

@@ -29,7 +29,6 @@
 )
 
 
-import sys
 from typing import Any
 import wx
 
@@ -44,11 +43,7 @@
 from . import gestureBinding
 from .abc import RuleAwarePanelBase
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping
-else:
-    from collections.abc import Mapping
+from collections.abc import Mapping
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/manager.py

@@ -30,7 +30,6 @@
 
 
 from collections import namedtuple
-import sys
 import wx
 
 import addonHandler
@@ -47,11 +46,7 @@
 from .. import ContextualDialog, showContextualDialog, stripAccel
 from .editor import getSummary
 
-
-if sys.version_info[1] < 9:
-    from typing import Mapping
-else:
-    from collections.abc import Mapping
+from collections.abc import Mapping
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/rule/properties.py

@@ -31,7 +31,6 @@
 from collections import ChainMap
 from abc import abstractmethod
 from enum import Enum
-import sys
 from typing import Any
 import wx
 
@@ -46,11 +45,7 @@
 from ...utils import guarded, logException, updateOrDrop
 from .. import ContextualSettingsPanel, EditorType, ListCtrlAutoWidth, SingleFieldEditorMixin
 
-
-if sys.version_info[1] < 9:
-    from typing import Iterator, Mapping
-else:
-    from collections.abc import Iterator, Mapping
+from collections.abc import Iterator, Mapping
 
 
 addonHandler.initTranslation()

addon/globalPlugins/webAccess/gui/webModule/__init__.py

@@ -23,9 +23,6 @@
 __author__ = "Julien Cochuyt <j.cochuyt@accessolutions.fr>"
 
 
-import sys
-from typing import Any
-
 import os
 import wx
 
@@ -36,12 +33,6 @@
 from ...webModuleHandler import WebModule
 
 
-if sys.version_info[1] < 9:
-    from typing import Mapping
-else:
-    from collections.abc import Mapping
-
-
 addonHandler.initTranslation()