Correct some consistency issues.

python · ned-deily · Mar 28, 2024 · Mar 16, 2024 · Mar 16, 2024 · Mar 19, 2024
commit 97a081d7606ee725367cbba09e095504a667bd0f
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -996,10 +996,7 @@ def uname():
 
     # Normalize responses on Apple mobile platforms
     if sys.platform in {'ios', 'tvos'}:
-        system, release, model, is_simulator = ios_ver()
-
-        if is_simulator:
-            machine = f'{model}Simulator'
+        system, release, machine, _ = ios_ver()
 
     vals = system, node, release, version, machine
     # Replace 'unknown' values with the more portable ''
@@ -1280,7 +1277,8 @@ def platform(aliased=False, terse=False):
         system, release, version = system_alias(system, release, version)
 
     if system == 'Darwin':
-        if sys.platform in {'ios', 'tvos'}:
+        # macOS and iOS both report as a "Darwin" kernel
+        if sys.platform == "ios":
             system, release, _, _ = ios_ver()
         else:
             macos_release = mac_ver()[0]

@@ -303,9 +303,9 @@ def _get_preferred_schemes():
         }
     if sys.platform in {'ios', 'tvos', 'watchos'}:
         return {
-            'prefix': sys.platform,
-            'home': sys.platform,
-            'user': sys.platform,
+            'prefix': "ios",
+            'home': "ios",
+            'user': "ios",
         }
 
     return {