Only target abi3t (for expediency)

Author: stefanor

Doc/whatsnew/3.16.rst

@@ -75,14 +75,6 @@ New features
 Other language changes
 ======================
 
-* Stable ABI extensions now include a multiarch tuple in the
-  filename, e.g. ``foo.abi3-x86-64-linux-gnu.so``.
-  This permits stable ABI extensions for multiple architectures to be
-  co-installed into the same directory, without clashing with each
-  other, as regular dynamic extensions do. Build tools will generate
-  these multiarch tagged filenames, by default, when targeting
-  compatibility with at least Python 3.15.
-  (Contributed by Stefano Rivera in :gh:`122931`.)
 
 
 New modules

Lib/test/test_importlib/extension/test_finder.py

@@ -62,6 +62,7 @@ def test_failure(self):
 
     def test_abi3_extension_suffixes(self):
         suffixes = self.machinery.EXTENSION_SUFFIXES
+        platform = sysconfig.get_config_var("SOABI_PLATFORM").strip('"')
         if 'win32' in sys.platform:
             # Either "_d.pyd" or ".pyd" must be in suffixes
             self.assertTrue({"_d.pyd", ".pyd"}.intersection(suffixes))
@@ -72,20 +73,10 @@ def test_abi3_extension_suffixes(self):
                 self.assertNotIn(".abi3.so", suffixes)
             else:
                 self.assertIn(".abi3.so", suffixes)
-            self.assertIn(".abi3t.so", suffixes)
-
-    @unittest.skipIf(
-        not (sysconfig.get_config_var("SOABI_PLATFORM") or "").strip('"'),
-        "Linux-only test"
-    )
-    def test_multiarch_abi3_extension_suffixes(self):
-        suffixes = self.machinery.EXTENSION_SUFFIXES
-        platform = sysconfig.get_config_var("SOABI_PLATFORM").strip('"')
-        if Py_GIL_DISABLED:
-            self.assertNotIn(f".abi3-{platform}.so", suffixes)
-        else:
-            self.assertIn(f".abi3-{platform}.so", suffixes)
-        self.assertIn(f".abi3t-{platform}.so", suffixes)
+            if platform:
+                self.assertIn(f".abi3t-{platform}.so", suffixes)
+            else:
+                self.assertIn(".abi3t.so", suffixes)
 
 
 (Frozen_FinderTests,

Misc/NEWS.d/next/C_API/2024-08-12-09-48-04.gh-issue-122931.QwHc2l.rst

@@ -1,2 +1 @@
-Allow importing stable ABI C extensions that include a multiarch tuple
-in their filename, e.g. ``foo.abi3-x86-64-linux-gnu.so``.
+Linux: Include multiarch tuples in ``abi3t`` stable ABI C extension filenames, e.g. ``foo.abi3t-x86-64-linux-gnu.so``.

Python/dynload_shlib.c

@@ -46,15 +46,13 @@ const char *_PyImport_DynLoadFiletab[] = {
     "." ALT_SOABI ".so",
 #endif
 #ifndef Py_GIL_DISABLED
-#ifdef SOABI_PLATFORM
-    ".abi" PYTHON_ABI_STRING "-" SOABI_PLATFORM ".so",
-#endif  /* SOABI_PLATFORM */
     ".abi" PYTHON_ABI_STRING ".so",
 #endif  /* Py_GIL_DISABLED */
 #ifdef SOABI_PLATFORM
     ".abi" PYTHON_ABI_STRING "t-" SOABI_PLATFORM ".so",
-#endif  /* SOABI_PLATFORM */
+#else
     ".abi" PYTHON_ABI_STRING "t.so",
+#endif  /* SOABI_PLATFORM */
     ".so",
 #endif  /* __CYGWIN__ */
     NULL,