feerrenrut · Mar 25, 2021 · Dec 2, 2020 · Dec 2, 2020 · Dec 2, 2020 · Dec 2, 2020
@@ -324,7 +324,7 @@ def _getTextWithFieldsForUIARange(  # noqa: C901
 
 class EdgeNode(web.UIAWeb):
 
-	_edgeIsPreGapRemoval = winVersion.winVersion.build < 15048
+	_edgeIsPreGapRemoval = winVersion.getWinVer().build < 15048
 
 	_TextInfo = EdgeTextInfo_preGapRemoval if _edgeIsPreGapRemoval else EdgeTextInfo
 

@@ -173,10 +173,12 @@ def event_UIA_window_windowOpen(self, obj, nextHandler):
 			return
 		# #9104: different aspects of modern input panel are represented by automation iD's.
 		childAutomationID = obj.firstChild.UIAElement.cachedAutomationID
-		# Emoji panel for build 16299 and 17134.
+		# Emoji panel for 1709 (build 16299) and 1803 (17134).
+		emojiPanelInitial = winVersion.WIN10_1709
 		# This event is properly raised in build 17134.
+		emojiPanelWindowOpenEvent = winVersion.WIN10_1803
 		if (
-			winVersion.getWinVer().build <= 17134
+			winVersion.getWinVer() in (emojiPanelInitial, emojiPanelWindowOpenEvent)
 			and childAutomationID in (
 				"TEMPLATE_PART_ExpressiveInputFullViewFuntionBarItemControl",
 				"TEMPLATE_PART_ExpressiveInputFullViewFuntionBarCloseButton"

@@ -79,46 +79,6 @@ def __ge__(self, other):
 			>= (other.major, other.minor, other.build)
 		)
 
-	@staticmethod
-	def fromReleaseName(release: str, servicePack: str = ""):
-		"""Returns Windows version information based on release name.
-		For example, 6.2.9200 for '8'.
-		Versions other than 7 do not come with service packs.
-		On Windows 10, pass in either '10' or the string representing a specific Windows 10 release.
-		For example, '20H2' will return Windows version 10.0.19042.
-		"""
-		if release == "7":
-			return WIN7 if servicePack == "" else WIN7_SP1
-		elif release == "8":
-			return WIN8
-		elif release == "8.1":
-			return WIN81
-		elif release in ("10", "1507"):
-			return WIN10
-		elif release in WIN10_RELEASE_NAME_TO_BUILDS:
-			return WinVersion(
-				major=10,
-				minor=0,
-				build=WIN10_RELEASE_NAME_TO_BUILDS[release]
-			)
-		else:
-			raise ValueError(f"Unknown Windows release: {release}")
-
-	@staticmethod
-	def fromVersionText(versionText: str):
-		"""Returns a Windows version information based on version string
-		of the form major.minor.build.
-		"""
-		major, minor, build = versionText.split(".")
-		# Specifically for Windows 7 service pack 1.
-		servicePack = "1" if versionText == "6.1.7601" else ""
-		return WinVersion(
-			major=int(major),
-			minor=int(minor),
-			build=int(build),
-			servicePack=servicePack
-		)
-
 
 # Windows releases to WinVersion instances for easing comparisons.
 WIN7 = WinVersion(major=6, minor=1, build=7600)

@@ -22,25 +22,10 @@ def test_getWinVer(self):
 			winVerPython[:3]
 		)
 
-	def test_specificWinVer(self):
-		# Try detecting Windows 8.1 or later.
-		win81 = winVersion.WinVersion.fromReleaseName("8.1")
-		self.assertTupleEqual(
-			(win81.major, win81.minor, win81.build),
-			(6, 3, 9600)
-		)
-
-	def test_getWinVerFromVersionText(self):
-		# Windows 10 1507 is in fact Windows 10 initial release.
-		winTenInitial = winVersion.WinVersion.fromVersionText("10.0.10240")
-		self.assertEqual(
-			winTenInitial, winVersion.WIN10_1507
-		)
-
-	def test_getWinVerFromNonexistentRelease(self):
+	def test_getWinVerFromNonExistentRelease(self):
 		# Test the fact that there is no Windows 10 2003 (2004 exists, however).
-		with self.assertRaises(ValueError):
-			winVersion.WinVersion.fromReleaseName("2003")
+		with self.assertRaises(AttributeError):
+			may2020Update = winVersion.WIN10_2003  # NOQA: F841
 
 	def test_moreRecentWinVer(self):
 		# Specifically to test operators.