freakboy3742
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Lib/_ios_support.py‎
Lines changed: 2 additions & 1 deletion b/‎Lib/_ios_support.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Lib/importlib/_bootstrap_external.py‎
Lines changed: 2 additions & 1 deletion b/‎Lib/importlib/_bootstrap_external.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Lib/platform.py‎
Lines changed: 9 additions & 6 deletions b/‎Lib/platform.py‎
Lines changed: 9 additions & 6 deletions
diff --git a/‎Lib/subprocess.py‎
Lines changed: 4 additions & 1 deletion b/‎Lib/subprocess.py‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎Lib/test/datetimetester.py‎
Lines changed: 3 additions & 3 deletions b/‎Lib/test/datetimetester.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Lib/test/support/__init__.py‎
Lines changed: 9 additions & 0 deletions b/‎Lib/test/support/__init__.py‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎Lib/test/test_capi/test_misc.py‎
Lines changed: 2 additions & 2 deletions b/‎Lib/test/test_capi/test_misc.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Lib/test/test_import/__init__.py‎
Lines changed: 5 additions & 5 deletions b/‎Lib/test/test_import/__init__.py‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎Lib/test/test_importlib/extension/test_finder.py‎
Lines changed: 2 additions & 2 deletions b/‎Lib/test/test_importlib/extension/test_finder.py‎
Lines changed: 2 additions & 2 deletions
@@ -82,6 +82,7 @@ iOS/testbed/Python.xcframework/ios-*/Python.framework
 iOS/testbed/iOSTestbed.xcodeproj/project.xcworkspace
 iOS/testbed/iOSTestbed.xcodeproj/xcuserdata
 iOS/testbed/iOSTestbed.xcodeproj/xcshareddata
+MacCatalyst/Resources/Info.plist
 visionOS/testbed/Python.xcframework/xros-*/bin
 visionOS/testbed/Python.xcframework/xros-*/include
 visionOS/testbed/Python.xcframework/xros-*/lib
 
@@ -25,6 +25,7 @@
 def get_platform_ios():
     # Determine if this is a simulator using the multiarch value
     is_simulator = sys.implementation._multiarch.endswith("simulator")
+    is_catalyst = sys.implementation._multiarch.endswith("macabi")
 
     # We can't use ctypes; abort
     if not objc:
@@ -68,4 +69,4 @@ def get_platform_ios():
     release = objc.objc_msgSend(device_systemVersion, SEL_UTF8String).decode()
     model = objc.objc_msgSend(device_model, SEL_UTF8String).decode()
 
-    return system, release, model, is_simulator
+    return system, release, model, is_simulator, is_catalyst
@@ -1535,7 +1535,8 @@ def _get_supported_file_loaders():
     """
     extension_loaders = []
     if hasattr(_imp, 'create_dynamic'):
-        if sys.platform in {"ios", "tvos", "watchos", "visionos"}:
+        # Mac Catalyst does NOT use the AppleFrameworkLoader.
+        if sys.platform in {"ios", "tvos", "watchos", "visionos"} and not sys.implementation._multiarch.endswith("macabi"):
             extension_loaders = [(AppleFrameworkLoader, [
                 suffix.replace(".so", ".fwork")
                 for suffix in _imp.extension_suffixes()
 
@@ -508,11 +508,11 @@ def mac_ver(release='', versioninfo=('', '', ''), machine=''):
 # A namedtuple for iOS version information.
 IOSVersionInfo = collections.namedtuple(
     "IOSVersionInfo",
-    ["system", "release", "model", "is_simulator"]
+    ["system", "release", "model", "is_simulator", "is_catalyst"]
 )
 
 
-def ios_ver(system="", release="", model="", is_simulator=False):
+def ios_ver(system="", release="", model="", is_simulator=False, is_catalyst=False):
     """Get iOS version information, and return it as a namedtuple:
         (system, release, model, is_simulator).
 
@@ -525,7 +525,7 @@ def ios_ver(system="", release="", model="", is_simulator=False):
         if result is not None:
             return IOSVersionInfo(*result)
 
-    return IOSVersionInfo(system, release, model, is_simulator)
+    return IOSVersionInfo(system, release, model, is_simulator, is_catalyst)
 
 
 # A namedtuple for tvOS version information.
@@ -547,6 +547,7 @@ def tvos_ver(system="", release="", model="", is_simulator=False):
         import _ios_support
         result = _ios_support.get_platform_ios()
         if result is not None:
+            result = result[:-1]  # ignore the Catalyst flag
             return TVOSVersionInfo(*result)
 
     return TVOSVersionInfo(system, release, model, is_simulator)
@@ -571,6 +572,7 @@ def watchos_ver(system="", release="", model="", is_simulator=False):
         import _ios_support
         result = _ios_support.get_platform_ios()
         if result is not None:
+            result = result[:-1]  # ignore the Catalyst flag
             return WatchOSVersionInfo(*result)
 
     return WatchOSVersionInfo(system, release, model, is_simulator)
@@ -595,6 +597,7 @@ def visionos_ver(system="", release="", model="", is_simulator=False):
         import _ios_support
         result = _ios_support.get_platform_ios()
         if result is not None:
+            result = result[:-1]  # ignore the Catalyst flag
             return VisionOSVersionInfo(*result)
 
     return VisionOSVersionInfo(system, release, model, is_simulator)
@@ -968,7 +971,7 @@ def get_OpenVMS():
     # there's only one CPU architecture for devices, so we know the right
     # answer.
     def get_ios():
-        if sys.implementation._multiarch.endswith("simulator"):
+        if sys.implementation._multiarch.endswith("simulator") or sys.implementation._multiarch.endswith("macabi"):
             return os.uname().machine
         return 'arm64'
 
@@ -1148,7 +1151,7 @@ def uname():
 
     # Normalize responses on Apple mobile platforms
     if sys.platform == 'ios':
-        system, release, _, _ = ios_ver()
+        system, release, _, _, _ = ios_ver()
     if sys.platform == 'tvos':
         system, release, _, _ = tvos_ver()
     if sys.platform == 'watchos':
@@ -1443,7 +1446,7 @@ def platform(aliased=False, terse=False):
     if system == 'Darwin':
         # macOS and iOS both report as a "Darwin" kernel
         if sys.platform == "ios":
-            system, release, _, _ = ios_ver()
+            system, release, _, _, _ = ios_ver()
         elif sys.platform == "tvos":
             system, release, _, _ = tvos_ver()
         elif sys.platform == "watchos":
 
@@ -75,7 +75,10 @@
     _mswindows = True
 
 # some platforms do not support subprocesses
-_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos", "visionos"}
+_can_fork_exec = (
+    sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos", "visionos"}
+    or sys.implementation._multiarch.endswith("macabi")
+)
 
 if _mswindows:
     import _winapi
 
@@ -7159,9 +7159,9 @@ def test_datetime_from_timestamp(self):
                     self.assertEqual(dt_orig, dt_rt)
 
     def test_type_check_in_subinterp(self):
-        # Apple mobile platforms require the use of the custom framework loader,
-        # not the ExtensionFileLoader.
-        if support.is_apple_mobile:
+        # Apple mobile platforms EXCEPT Mac Catalyst require the use of the
+        # custom framework loader, not the ExtensionFileLoader.
+        if support.needs_apple_fworks:
             extension_loader = "AppleFrameworkLoader"
         else:
             extension_loader = "ExtensionFileLoader"
 
@@ -46,6 +46,7 @@
     # sys
     "MS_WINDOWS", "is_jython", "is_android", "is_emscripten", "is_wasi",
     "is_apple_mobile", "check_impl_detail", "unix_shell", "setswitchinterval",
+    "is_mac_catalyst", "needs_apple_fworks",
     # os
     "get_pagesize",
     # network
@@ -576,6 +577,8 @@ def skip_wasi_stack_overflow():
 
 is_apple_mobile = sys.platform in {"ios", "tvos", "watchos", "visionos"}
 is_apple = is_apple_mobile or sys.platform == "darwin"
+is_mac_catalyst = sys.implementation._multiarch.endswith("macabi")
+needs_apple_fworks = is_apple_mobile and not is_mac_catalyst
 
 has_fork_support = hasattr(os, "fork") and not (
     # WASM and Apple mobile platforms do not support subprocesses.
@@ -586,6 +589,9 @@ def skip_wasi_stack_overflow():
     # Although Android supports fork, it's unsafe to call it from Python because
     # all Android apps are multi-threaded.
     or is_android
+
+    # Mac Catalyst supports subprocesses.
+    and not is_mac_catalyst
 )
 
 def requires_fork():
@@ -601,6 +607,9 @@ def requires_fork():
     # practice (see PEP 738). And most of the tests that use them are calling
     # sys.executable, which won't work when Python is embedded in an Android app.
     or is_android
+
+    # Mac Catalyst supports subprocesses.
+    and not is_mac_catalyst
 )
 
 def requires_subprocess():
 
@@ -1920,7 +1920,7 @@ def test_module_state_shared_in_global(self):
 
         # Apple extensions must be distributed as frameworks. This requires
         # a specialist loader.
-        if support.is_apple_mobile:
+        if support.needs_apple_fworks:
             loader = "AppleFrameworkLoader"
         else:
             loader = "ExtensionFileLoader"
@@ -2604,7 +2604,7 @@ def setUp(self):
         origin = importlib.util.find_spec('_testmultiphase').origin
         # Apple extensions must be distributed as frameworks. This requires
         # a specialist loader.
-        if support.is_apple_mobile:
+        if support.needs_apple_fworks:
             loader = importlib.machinery.AppleFrameworkLoader(fullname, origin)
         else:
             loader = importlib.machinery.ExtensionFileLoader(fullname, origin)
 
@@ -33,7 +33,7 @@
     swap_attr,
     swap_item,
     cpython_only,
-    is_apple_mobile,
+    needs_apple_fworks,
     is_emscripten,
     is_wasi,
     run_in_subinterp,
@@ -111,7 +111,7 @@ def require_builtin(module, *, skip=False):
 def require_extension(module, *, skip=False):
     # Apple extensions must be distributed as frameworks. This requires
     # a specialist loader.
-    if is_apple_mobile:
+    if needs_apple_fworks:
         _require_loader(module, AppleFrameworkLoader, skip)
     else:
         _require_loader(module, ExtensionFileLoader, skip)
@@ -126,7 +126,7 @@ def require_pure_python(module, *, skip=False):
 def create_extension_loader(modname, filename):
     # Apple extensions must be distributed as frameworks. This requires
     # a specialist loader.
-    if is_apple_mobile:
+    if needs_apple_fworks:
         return AppleFrameworkLoader(modname, filename)
     else:
         return ExtensionFileLoader(modname, filename)
@@ -2217,7 +2217,7 @@ def import_script(self, name, fd, filename=None, check_override=None):
         if filename:
             # Apple extensions must be distributed as frameworks. This requires
             # a specialist loader.
-            if is_apple_mobile:
+            if needs_apple_fworks:
                 loader = "AppleFrameworkLoader"
             else:
                 loader = "ExtensionFileLoader"
@@ -2692,7 +2692,7 @@ def setUpClass(cls):
         # Apple extensions must be distributed as frameworks. This requires
         # a specialist loader, and we need to differentiate between the
         # spec.origin and the original file location.
-        if is_apple_mobile:
+        if needs_apple_fworks:
             assert cls.LOADER is AppleFrameworkLoader
 
             cls.ORIGIN = spec.origin
 
@@ -1,4 +1,4 @@
-from test.support import is_apple_mobile
+from test.support import needs_apple_fworks
 from test.test_importlib import abc, util
 
 machinery = util.import_importlib('importlib.machinery')
@@ -20,7 +20,7 @@ def setUp(self):
             )
 
     def find_spec(self, fullname):
-        if is_apple_mobile:
+        if needs_apple_fworks:
             # Apple mobile platforms require a specialist loader that uses
             # .fwork files as placeholders for the true `.so` files.
             loaders = [