Correct platform tests for tvOS/watchOS/visionOS.

Author: freakboy3742

Lib/platform.py

@@ -532,7 +532,7 @@ def ios_ver(system="", release="", model="", is_simulator=False):
     If values can't be determined, they are set to values provided as
     parameters.
     """
-    if sys.platform == "ios":
+    if sys.platform in {"ios", "tvos", "visionos", "watchos"}:
         import _ios_support
         result = _ios_support.get_platform_ios()
         if result is not None:
@@ -1026,7 +1026,7 @@ def uname():
         release = android_ver().release
 
     # Normalize responses on Apple mobile platforms
-    if sys.platform in {'ios', 'tvos', 'visionos', 'watchos'}:
+    if sys.platform in {"ios", "tvos", "visionos", "watchos"}:
         system, release, _, _ = ios_ver()
 
     vals = system, node, release, version, machine
@@ -1315,7 +1315,7 @@ def platform(aliased=False, terse=False):
 
     if system == 'Darwin':
         # macOS and iOS both report as a "Darwin" kernel
-        if sys.platform in {'ios', 'tvos', 'visionos', 'watchos'}:
+        if sys.platform in {"ios", "tvos", "visionos", "watchos"}:
             system, release, _, _ = ios_ver()
         else:
             macos_release = mac_ver()[0]

Lib/test/test_platform.py

@@ -299,9 +299,7 @@ def test_uname(self):
                         # All other platforms - sys.platform is the lower case
                         # form of system (e.g., visionOS->visionos)
                         self.assertEqual(res.system.lower(), sys.platform)
-                    # Use the platform-specific version method
-                    platform_ver = getattr(platform, f"{sys.platform}_ver")
-                    self.assertEqual(res.release, platform_ver().release)
+                    self.assertEqual(res.release, platform.ios_ver().release)
                 else:
                     self.assertEqual(res.system, "")
                     self.assertEqual(res.release, "")
@@ -493,8 +491,8 @@ def test_mac_ver_with_fork(self):
     def test_ios_ver(self):
         result = platform.ios_ver()
 
-        # ios_ver is only fully available on iOS where ctypes is available.
-        if sys.platform == "ios" and _ctypes:
+        # ios_ver is only fully available on Apple mobile platorms where ctypes is available.
+        if sys.platform in {"ios", "tvos", "visionos", "watchos"} and _ctypes:
             system, release, model, is_simulator = result
             # Result is a namedtuple
             self.assertEqual(result.system, system)
@@ -506,7 +504,10 @@ def test_ios_ver(self):
             # ios_ver(), so we check that the values are broadly what we expect.
 
             # System is either iOS or iPadOS, depending on the test device
-            self.assertIn(system, {"iOS", "iPadOS"})
+            if sys.platform == "ios":
+                self.assertIn(system, {"iOS", "iPadOS"})
+            else:
+                self.assertEqual(system.lower(), sys.platform)
 
             # Release is a numeric version specifier with at least 2 parts
             parts = release.split(".")
@@ -516,11 +517,17 @@ def test_ios_ver(self):
             # If this is a simulator, we get a high level device descriptor
             # with no identifying model number. If this is a physical device,
             # we get a model descriptor like "iPhone13,1"
+            devices = {
+                "ios": {"iPhone", "iPad"},
+                "tvos": {"Apple TV"},
+                "visionos": {"Apple Vision Pro"},
+                "watchos": {"Apple Watch"},
+            }[sys.platform]
             if is_simulator:
-                self.assertIn(model, {"iPhone", "iPad"})
+                self.assertIn(model, devices)
             else:
                 self.assertTrue(
-                    (model.startswith("iPhone") or model.startswith("iPad"))
+                    any(model.startswith(d) for d in devices)
                     and "," in model
                 )