Use a namedtuple for ios_ver().

python · ned-deily · Mar 28, 2024 · Mar 16, 2024 · Mar 16, 2024 · Mar 19, 2024
commit f584d29e1a006fa47215c8b18748ef0fcb16d2bf
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -496,8 +496,16 @@ def mac_ver(release='', versioninfo=('', '', ''), machine=''):
     # If that also doesn't work return the default values
     return release, versioninfo, machine
 
+
+# A namedtuple for iOS version information.
+IOSVersionInfo = collections.namedtuple(
+    "IOSVersionInfo",
+    ["system", "release", "model", "is_simulator"]
+)
+
+
 def ios_ver(system="", release="", model="", is_simulator=False):
-    """Get iOS version information, and return it as a tuple:
+    """Get iOS version information, and return it as a namedtuple:
         (system, release, model, is_simulator).
 
     If values can't be determined, they are set to values provided as
@@ -507,9 +515,9 @@ def ios_ver(system="", release="", model="", is_simulator=False):
         import _ios_support
         result = _ios_support.get_platform_ios()
         if result is not None:
-            return result
+            return IOSVersionInfo(*result)
 
-    return system, release, model, is_simulator
+    return IOSVersionInfo(system, release, model, is_simulator)
 
 
 def _java_getprop(name, default):

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
@@ -410,8 +410,16 @@ def test_mac_ver_with_fork(self):
             support.wait_process(pid, exitcode=0)
 
     def test_ios_ver(self):
-        system, release, model, is_simulator = platform.ios_ver()
+        result = platform.ios_ver()
         if sys.platform == "ios":
+            system, release, model, is_simulator = result
+
+            # Result is a namedtuple
+            self.assertEqual(result.system, system)
+            self.assertEqual(result.release, release)
+            self.assertEqual(result.model, model)
+            self.assertEqual(result.is_simulator, is_simulator)
+
             # We can't assert specific values without reproducing the logic of
             # ios_ver(), so we check that the values are broadly what we expect.
 
@@ -438,10 +446,10 @@ def test_ios_ver(self):
         else:
             # On non-iOS platforms, calling ios_ver doesn't fail; you get
             # default values
-            self.assertEqual(system, "")
-            self.assertEqual(release, "")
-            self.assertEqual(model, "")
-            self.assertFalse(is_simulator)
+            self.assertEqual(result.system, "")
+            self.assertEqual(result.release, "")
+            self.assertEqual(result.model, "")
+            self.assertFalse(result.is_simulator)
 
     @unittest.skipIf(support.is_emscripten, "Does not apply to Emscripten")
     def test_libc_ver(self):