Merge for #27083

diff --cc Lib/importlib/_bootstrap_external.py
Simple merge

diff --cc Lib/test/test_importlib/extension/test_case_sensitivity.py
index b74e9003910a618b38397042a873b8d2a48c934a,c112ca7564e0d1f4055fdb9954d4527e84ae0a8e..0dd9c8615f5182aaa6b717d2d8f96dbd03b020db
--- 1/Lib/test/test_importlib/extension/test_case_sensitivity.py
--- 2/Lib/test/test_importlib/extension/test_case_sensitivity.py
+++ b/Lib/test/test_importlib/extension/test_case_sensitivity.py
@@@ -7,9 -9,11 +8,9 @@@ importlib = util.import_importlib('impo
  machinery = util.import_importlib('importlib.machinery')
  
  
 -# XXX find_spec tests
 -
  @unittest.skipIf(util.EXTENSIONS.filename is None, '_testcapi not available')
  @util.case_insensitive_tests
- class ExtensionModuleCaseSensitivityTest:
+ class ExtensionModuleCaseSensitivityTest(util.CASEOKTestBase):
  
      def find_module(self):
          good_name = util.EXTENSIONS.name

diff --cc Lib/test/test_importlib/source/test_case_sensitivity.py
Simple merge

diff --cc Lib/test/test_importlib/util.py
Simple merge