@@ -93,11 +93,11 @@ index 57a77d51a02..f1157e189a3 100644
9393 Group database entries are reported as a tuple-like object, whose attributes
9494 correspond to the members of the ``group`` structure (Attribute field below, see
9595diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
96- index b100e6c8e85..c7faf8ba218 100644
96+ index 7ecfc6ad3c4..9b8b9f8474e 100644
9797--- a/Doc/library/importlib.rst
9898+++ b/Doc/library/importlib.rst
99- @@ -1241 ,6 +1241 ,69 @@
100- and how the module's :attr:`__file__` is populated.
99+ @@ -1234 ,6 +1234 ,69 @@
100+ and how the module's :attr:`__file__` is populated.
101101
102102
103103+ .. class:: AppleFrameworkLoader(name, path)
@@ -812,7 +812,7 @@ index 27909b763e9..fb5353e1895 100644
812812 categories: URL parsing and URL quoting. These are covered in detail in
813813 the following sections.
814814diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
815- index 57b0ee7157c..c24945169e8 100644
815+ index 546ce3716d2..bdebc700db2 100644
816816--- a/Doc/library/venv.rst
817817+++ b/Doc/library/venv.rst
818818@@ -56,7 +56,7 @@
@@ -1298,7 +1298,7 @@ index e1a3111f36a..f55a12f1ab8 100644
12981298+ all code that is known to cause issues with the App Store review process. This
12991299+ patch is applied automatically when building for iOS.
13001300diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
1301- index 31d37aad2a7..44fb00de373 100644
1301+ index 8b67652d1df..2dfac075843 100644
13021302--- a/Doc/using/mac.rst
13031303+++ b/Doc/using/mac.rst
13041304@@ -188,6 +188,28 @@
@@ -2975,7 +2975,7 @@ index 0cd9e721b20..ffa58230425 100644
29752975 import subprocess
29762976 argv = [sys.executable, '-c', '''if True:
29772977diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
2978- index 8b68653779e..2117c1f18de 100644
2978+ index adabf6d6ed7..2b7ed85efd1 100644
29792979--- a/Lib/test/test_io.py
29802980+++ b/Lib/test/test_io.py
29812981@@ -39,11 +39,9 @@
@@ -3064,7 +3064,7 @@ index 1867e8c957f..f75e40940e4 100644
30643064 'test requires %s bytes and a long time to run' % str(0x180000000))
30653065 f = open(TESTFN, 'w+b')
30663066diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
3067- index 7a04e5ad500..ee18f99c476 100644
3067+ index 8277ec9b608..5ff0a528c74 100644
30683068--- a/Lib/test/test_os.py
30693069+++ b/Lib/test/test_os.py
30703070@@ -2372,6 +2372,7 @@
@@ -3075,7 +3075,7 @@ index 7a04e5ad500..ee18f99c476 100644
30753075 def test_fpathconf(self):
30763076 self.check(os.pathconf, "PC_NAME_MAX")
30773077 self.check(os.fpathconf, "PC_NAME_MAX")
3078- @@ -3945 ,6 +3946 ,7 @@
3078+ @@ -3946 ,6 +3947 ,7 @@
30793079 self.assertGreaterEqual(size.columns, 0)
30803080 self.assertGreaterEqual(size.lines, 0)
30813081
@@ -3201,7 +3201,7 @@ index b62a9e38977..39b9f7b178b 100644
32013201 for mac_ver, expected_terse, expected in [
32023202 # darwin: mac_ver() returns empty strings
32033203diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
3204- index 7ed45acf28c..9bb1d056eb7 100644
3204+ index aa811326e4c..f26d80cb643 100644
32053205--- a/Lib/test/test_posix.py
32063206+++ b/Lib/test/test_posix.py
32073207@@ -1,7 +1,7 @@
@@ -3213,15 +3213,15 @@ index 7ed45acf28c..9bb1d056eb7 100644
32133213 from test.support import os_helper
32143214 from test.support import warnings_helper
32153215 from test.support.script_helper import assert_python_ok
3216- @@ -564 ,6 +564 ,7 @@
3216+ @@ -566 ,6 +566 ,7 @@
32173217
32183218 @unittest.skipUnless(hasattr(posix, 'confstr'),
32193219 'test needs posix.confstr()')
32203220+ @unittest.skipIf(support.is_apple_mobile, "gh-118201: Test is flaky on iOS")
32213221 def test_confstr(self):
32223222 self.assertRaises(ValueError, posix.confstr, "CS_garbage")
32233223 self.assertEqual(len(posix.confstr("CS_PATH")) > 0, True)
3224- @@ -792 ,9 +793 ,10 @@
3224+ @@ -794 ,9 +795 ,10 @@
32253225 check_stat(uid, gid)
32263226 self.assertRaises(OSError, chown_func, first_param, 0, -1)
32273227 check_stat(uid, gid)
@@ -3235,7 +3235,7 @@ index 7ed45acf28c..9bb1d056eb7 100644
32353235 # test illegal types
32363236 for t in str, float:
32373237 self.assertRaises(TypeError, chown_func, first_param, t(uid), gid)
3238- @@ -1260 ,8 +1262 ,8 @@
3238+ @@ -1262 ,8 +1264 ,8 @@
32393239 self.assertIsInstance(lo, int)
32403240 self.assertIsInstance(hi, int)
32413241 self.assertGreaterEqual(hi, lo)
@@ -3246,7 +3246,7 @@ index 7ed45acf28c..9bb1d056eb7 100644
32463246 self.assertRaises(OSError, posix.sched_get_priority_min, -23)
32473247 self.assertRaises(OSError, posix.sched_get_priority_max, -23)
32483248
3249- @@ -2041 ,11 +2043 ,13 @@
3249+ @@ -2043 ,11 +2045 ,13 @@
32503250
32513251
32523252 @unittest.skipUnless(hasattr(os, 'posix_spawn'), "test needs os.posix_spawn")
@@ -3340,7 +3340,7 @@ index 7bc5d12e09c..1680706a4d5 100644
33403340 'need os.get_terminal_size()')
33413341 def test_stty_match(self):
33423342diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
3343- index c7b9549dd3a..591cd4177d9 100644
3343+ index a45527d7315..8101322347e 100644
33443344--- a/Lib/test/test_signal.py
33453345+++ b/Lib/test/test_signal.py
33463346@@ -13,9 +13,10 @@
@@ -3356,7 +3356,7 @@ index c7b9549dd3a..591cd4177d9 100644
33563356 try:
33573357 import _testcapi
33583358 except ImportError:
3359- @@ -832 ,7 +833 ,7 @@
3359+ @@ -834 ,7 +835 ,7 @@
33603360 self.assertEqual(self.hndl_called, True)
33613361
33623362 # Issue 3864, unknown if this affects earlier versions of freebsd also
@@ -3365,7 +3365,7 @@ index c7b9549dd3a..591cd4177d9 100644
33653365 'itimer not reliable (does not mix well with threading) on some BSDs.')
33663366 def test_itimer_virtual(self):
33673367 self.itimer = signal.ITIMER_VIRTUAL
3368- @@ -1344 ,7 +1345 ,7 @@
3368+ @@ -1346 ,7 +1347 ,7 @@
33693369 # Python handler
33703370 self.assertEqual(len(sigs), N, "Some signals were lost")
33713371
@@ -3375,7 +3375,7 @@ index c7b9549dd3a..591cd4177d9 100644
33753375 "test needs SIGUSR1")
33763376 @threading_helper.requires_working_threading()
33773377diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
3378- index 545564094e1..63418d702c8 100644
3378+ index acfa1cd503b..45cfa075803 100644
33793379--- a/Lib/test/test_socket.py
33803380+++ b/Lib/test/test_socket.py
33813381@@ -3,6 +3,7 @@
@@ -4191,12 +4191,12 @@ index 0a310000751..83a2bc469ae 100644
41914191 }
41924192-
41934193diff --git a/Python/marshal.c b/Python/marshal.c
4194- index 8ecdb738147..79ae624c975 100644
4194+ index 3fc3f890422..892debe38dc 100644
41954195--- a/Python/marshal.c
41964196+++ b/Python/marshal.c
4197- @@ -15,6 +15,10 @@
4198- #include "pycore_hashtable.h" // _Py_hashtable_t
4197+ @@ -16,6 +16,10 @@
41994198 #include "marshal.h" // Py_MARSHAL_VERSION
4199+ #include "pycore_pystate.h" // _PyInterpreterState_GET()
42004200
42014201+ #ifdef __APPLE__
42024202+ # include "TargetConditionals.h"
@@ -4205,7 +4205,7 @@ index 8ecdb738147..79ae624c975 100644
42054205 /*[clinic input]
42064206 module marshal
42074207 [clinic start generated code]*/
4208- @@ -34 ,11 +38 ,14 @@
4208+ @@ -35 ,11 +39 ,14 @@
42094209 * #if defined(MS_WINDOWS) && defined(_DEBUG)
42104210 */
42114211 #if defined(MS_WINDOWS)
@@ -4224,7 +4224,7 @@ index 8ecdb738147..79ae624c975 100644
42244224
42254225 #define TYPE_NULL '0'
42264226diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h
4227- index ed4a0ac2dd3..bc8da328ba9 100644
4227+ index 1b1a1bdee78..47372fae53e 100644
42284228--- a/Python/stdlib_module_names.h
42294229+++ b/Python/stdlib_module_names.h
42304230@@ -39,6 +39,7 @@
@@ -4769,7 +4769,7 @@ index d74fb6deac9..1bb6a05dc11 100755
47694769
47704770 # Local variables:
47714771diff --git a/configure b/configure
4772- index 4dfaeecfc0b..97f6ed048ad 100755
4772+ index 1c75810d9e8..e7785926f05 100755
47734773--- a/configure
47744774+++ b/configure
47754775@@ -975,10 +975,14 @@
@@ -6072,7 +6072,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
60726072
60736073 # check for long file support functions
60746074 ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
6075- @@ -22197 ,6 +22626 ,11 @@
6075+ @@ -22199 ,6 +22628 ,11 @@
60766076
60776077 done
60786078
@@ -6084,7 +6084,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
60846084
60856085 for ac_func in clock_settime
60866086 do :
6087- @@ -22207 ,7 +22641 ,7 @@
6087+ @@ -22209 ,7 +22643 ,7 @@
60886088
60896089 else $as_nop
60906090
@@ -6093,7 +6093,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
60936093 printf %s "checking for clock_settime in -lrt... " >&6; }
60946094 if test ${ac_cv_lib_rt_clock_settime+y}
60956095 then :
6096- @@ -22245 ,7 +22679 ,7 @@
6096+ @@ -22247 ,7 +22681 ,7 @@
60976097 if test "x$ac_cv_lib_rt_clock_settime" = xyes
60986098 then :
60996099
@@ -6102,15 +6102,15 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61026102
61036103
61046104 fi
6105- @@ -22254 ,6 +22688 ,7 @@
6105+ @@ -22256 ,6 +22690 ,7 @@
61066106 fi
61076107
61086108 done
61096109+ fi
61106110
61116111
61126112 for ac_func in clock_nanosleep
6113- @@ -22475 ,7 +22910 ,9 @@
6113+ @@ -22477 ,7 +22912 ,9 @@
61146114 if test "$cross_compiling" = yes
61156115 then :
61166116
@@ -6121,7 +6121,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61216121 ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
61226122 else
61236123 ac_cv_buggy_getaddrinfo=yes
6124- @@ -24377 ,7 +24814 ,7 @@
6124+ @@ -24379 ,7 +24816 ,7 @@
61256125 printf "%s\n" "$ABIFLAGS" >&6; }
61266126 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
61276127 printf %s "checking SOABI... " >&6; }
@@ -6130,7 +6130,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61306130 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
61316131 printf "%s\n" "$SOABI" >&6; }
61326132
6133- @@ -24385 ,7 +24822 ,7 @@
6133+ @@ -24387 ,7 +24824 ,7 @@
61346134 if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
61356135 # Similar to SOABI but remove "d" flag from ABIFLAGS
61366136
@@ -6139,7 +6139,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61396139
61406140 printf "%s\n" "#define ALT_SOABI \"${ALT_SOABI}\"" >>confdefs.h
61416141
6142- @@ -27136 ,24 +27573 ,28 @@
6142+ @@ -27138 ,24 +27575 ,28 @@
61436143 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
61446144 printf "%s\n" "$as_me: checking for device files" >&6;}
61456145
@@ -6180,7 +6180,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61806180 printf %s "checking for /dev/ptmx... " >&6; }
61816181 if test ${ac_cv_file__dev_ptmx+y}
61826182 then :
6183- @@ -27174 ,12 +27615 ,12 @@
6183+ @@ -27176 ,12 +27617 ,12 @@
61846184
61856185 fi
61866186
@@ -6196,7 +6196,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
61966196 printf %s "checking for /dev/ptc... " >&6; }
61976197 if test ${ac_cv_file__dev_ptc+y}
61986198 then :
6199- @@ -27200 ,10 +27641 ,11 @@
6199+ @@ -27202 ,10 +27643 ,11 @@
62006200
62016201 fi
62026202
@@ -6209,7 +6209,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
62096209 fi
62106210
62116211 if test $ac_sys_system = Darwin
6212- @@ -27645 ,6 +28087 ,8 @@
6212+ @@ -27647 ,6 +28089 ,8 @@
62136213 with_ensurepip=no ;; #(
62146214 WASI) :
62156215 with_ensurepip=no ;; #(
@@ -6218,7 +6218,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
62186218 *) :
62196219 with_ensurepip=upgrade
62206220 ;;
6221- @@ -28586 ,6 +29030 ,27 @@
6221+ @@ -28588 ,6 +29032 ,27 @@
62226222 py_cv_module_ossaudiodev=n/a
62236223 py_cv_module_spwd=n/a
62246224 ;; #(
@@ -6246,7 +6246,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
62466246 CYGWIN*) :
62476247
62486248
6249- @@ -32332 ,6 +32797 ,9 @@
6249+ @@ -32334 ,6 +32799 ,9 @@
62506250 "Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
62516251 "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
62526252 "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
@@ -6257,7 +6257,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
62576257 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
62586258 "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
62596259diff --git a/configure.ac b/configure.ac
6260- index 0d6df8e24e4..6ecb9fb8e85 100644
6260+ index d0d54050286..46d3019c5ca 100644
62616261--- a/configure.ac
62626262+++ b/configure.ac
62636263@@ -307,6 +307,161 @@
@@ -7375,7 +7375,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
73757375
73767376 # check for long file support functions
73777377 AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
7378- @@ -5263 ,11 +5662 ,17 @@
7378+ @@ -5265 ,11 +5664 ,17 @@
73797379 ])
73807380 ])
73817381
@@ -7398,7 +7398,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
73987398
73997399 AC_CHECK_FUNCS([clock_nanosleep], [], [
74007400 AC_CHECK_LIB([rt], [clock_nanosleep], [
7401- @@ -5413 ,7 +5818 ,9 @@
7401+ @@ -5415 ,7 +5820 ,9 @@
74027402 [ac_cv_buggy_getaddrinfo=no],
74037403 [ac_cv_buggy_getaddrinfo=yes],
74047404 [
@@ -7409,7 +7409,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
74097409 ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
74107410 else
74117411 ac_cv_buggy_getaddrinfo=yes
7412- @@ -5968 ,14 +6375 ,14 @@
7412+ @@ -5970 ,14 +6377 ,14 @@
74137413 AC_MSG_CHECKING([ABIFLAGS])
74147414 AC_MSG_RESULT([$ABIFLAGS])
74157415 AC_MSG_CHECKING([SOABI])
@@ -7426,7 +7426,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
74267426 AC_DEFINE_UNQUOTED([ALT_SOABI], ["${ALT_SOABI}"],
74277427 [Alternative SOABI used in debug build to load C extensions built in release mode])
74287428 fi
7429- @@ -6624 ,28 +7031 ,35 @@
7429+ @@ -6626 ,28 +7033 ,35 @@
74307430 AC_MSG_NOTICE([checking for device files])
74317431
74327432 dnl NOTE: Inform user how to proceed with files when cross compiling.
@@ -7482,15 +7482,15 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
74827482 fi
74837483
74847484 if test $ac_sys_system = Darwin
7485- @@ -6917 ,6 +7331 ,7 @@
7485+ @@ -6919 ,6 +7333 ,7 @@
74867486 AS_CASE([$ac_sys_system],
74877487 [Emscripten], [with_ensurepip=no],
74887488 [WASI], [with_ensurepip=no],
74897489+ [iOS|tvOS|watchOS], [with_ensurepip=no],
74907490 [with_ensurepip=upgrade]
74917491 )
74927492 ])
7493- @@ -7259 ,6 +7674 ,28 @@
7493+ @@ -7261 ,6 +7676 ,28 @@
74947494 [AIX], [PY_STDLIB_MOD_SET_NA([_scproxy], [spwd])],
74957495 [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [_crypt], [termios], [grp])],
74967496 [Darwin], [PY_STDLIB_MOD_SET_NA([ossaudiodev], [spwd])],
0 commit comments