@@ -93,11 +93,11 @@ index 57a77d51a02..f1157e189a3 100644
93
93
Group database entries are reported as a tuple-like object, whose attributes
94
94
correspond to the members of the ``group`` structure (Attribute field below, see
95
95
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
96
- index b100e6c8e85..c7faf8ba218 100644
96
+ index 7ecfc6ad3c4..9b8b9f8474e 100644
97
97
--- a/Doc/library/importlib.rst
98
98
+++ 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.
101
101
102
102
103
103
+ .. class:: AppleFrameworkLoader(name, path)
@@ -812,7 +812,7 @@ index 27909b763e9..fb5353e1895 100644
812
812
categories: URL parsing and URL quoting. These are covered in detail in
813
813
the following sections.
814
814
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
815
- index 57b0ee7157c..c24945169e8 100644
815
+ index 546ce3716d2..bdebc700db2 100644
816
816
--- a/Doc/library/venv.rst
817
817
+++ b/Doc/library/venv.rst
818
818
@@ -56,7 +56,7 @@
@@ -1298,7 +1298,7 @@ index e1a3111f36a..f55a12f1ab8 100644
1298
1298
+ all code that is known to cause issues with the App Store review process. This
1299
1299
+ patch is applied automatically when building for iOS.
1300
1300
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
1301
- index 31d37aad2a7..44fb00de373 100644
1301
+ index 8b67652d1df..2dfac075843 100644
1302
1302
--- a/Doc/using/mac.rst
1303
1303
+++ b/Doc/using/mac.rst
1304
1304
@@ -188,6 +188,28 @@
@@ -2975,7 +2975,7 @@ index 0cd9e721b20..ffa58230425 100644
2975
2975
import subprocess
2976
2976
argv = [sys.executable, '-c', '''if True:
2977
2977
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
2978
- index 8b68653779e..2117c1f18de 100644
2978
+ index adabf6d6ed7..2b7ed85efd1 100644
2979
2979
--- a/Lib/test/test_io.py
2980
2980
+++ b/Lib/test/test_io.py
2981
2981
@@ -39,11 +39,9 @@
@@ -3064,7 +3064,7 @@ index 1867e8c957f..f75e40940e4 100644
3064
3064
'test requires %s bytes and a long time to run' % str(0x180000000))
3065
3065
f = open(TESTFN, 'w+b')
3066
3066
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
3067
- index 7a04e5ad500..ee18f99c476 100644
3067
+ index 8277ec9b608..5ff0a528c74 100644
3068
3068
--- a/Lib/test/test_os.py
3069
3069
+++ b/Lib/test/test_os.py
3070
3070
@@ -2372,6 +2372,7 @@
@@ -3075,7 +3075,7 @@ index 7a04e5ad500..ee18f99c476 100644
3075
3075
def test_fpathconf(self):
3076
3076
self.check(os.pathconf, "PC_NAME_MAX")
3077
3077
self.check(os.fpathconf, "PC_NAME_MAX")
3078
- @@ -3945 ,6 +3946 ,7 @@
3078
+ @@ -3946 ,6 +3947 ,7 @@
3079
3079
self.assertGreaterEqual(size.columns, 0)
3080
3080
self.assertGreaterEqual(size.lines, 0)
3081
3081
@@ -3201,7 +3201,7 @@ index b62a9e38977..39b9f7b178b 100644
3201
3201
for mac_ver, expected_terse, expected in [
3202
3202
# darwin: mac_ver() returns empty strings
3203
3203
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
3204
- index 7ed45acf28c..9bb1d056eb7 100644
3204
+ index aa811326e4c..f26d80cb643 100644
3205
3205
--- a/Lib/test/test_posix.py
3206
3206
+++ b/Lib/test/test_posix.py
3207
3207
@@ -1,7 +1,7 @@
@@ -3213,15 +3213,15 @@ index 7ed45acf28c..9bb1d056eb7 100644
3213
3213
from test.support import os_helper
3214
3214
from test.support import warnings_helper
3215
3215
from test.support.script_helper import assert_python_ok
3216
- @@ -564 ,6 +564 ,7 @@
3216
+ @@ -566 ,6 +566 ,7 @@
3217
3217
3218
3218
@unittest.skipUnless(hasattr(posix, 'confstr'),
3219
3219
'test needs posix.confstr()')
3220
3220
+ @unittest.skipIf(support.is_apple_mobile, "gh-118201: Test is flaky on iOS")
3221
3221
def test_confstr(self):
3222
3222
self.assertRaises(ValueError, posix.confstr, "CS_garbage")
3223
3223
self.assertEqual(len(posix.confstr("CS_PATH")) > 0, True)
3224
- @@ -792 ,9 +793 ,10 @@
3224
+ @@ -794 ,9 +795 ,10 @@
3225
3225
check_stat(uid, gid)
3226
3226
self.assertRaises(OSError, chown_func, first_param, 0, -1)
3227
3227
check_stat(uid, gid)
@@ -3235,7 +3235,7 @@ index 7ed45acf28c..9bb1d056eb7 100644
3235
3235
# test illegal types
3236
3236
for t in str, float:
3237
3237
self.assertRaises(TypeError, chown_func, first_param, t(uid), gid)
3238
- @@ -1260 ,8 +1262 ,8 @@
3238
+ @@ -1262 ,8 +1264 ,8 @@
3239
3239
self.assertIsInstance(lo, int)
3240
3240
self.assertIsInstance(hi, int)
3241
3241
self.assertGreaterEqual(hi, lo)
@@ -3246,7 +3246,7 @@ index 7ed45acf28c..9bb1d056eb7 100644
3246
3246
self.assertRaises(OSError, posix.sched_get_priority_min, -23)
3247
3247
self.assertRaises(OSError, posix.sched_get_priority_max, -23)
3248
3248
3249
- @@ -2041 ,11 +2043 ,13 @@
3249
+ @@ -2043 ,11 +2045 ,13 @@
3250
3250
3251
3251
3252
3252
@unittest.skipUnless(hasattr(os, 'posix_spawn'), "test needs os.posix_spawn")
@@ -3340,7 +3340,7 @@ index 7bc5d12e09c..1680706a4d5 100644
3340
3340
'need os.get_terminal_size()')
3341
3341
def test_stty_match(self):
3342
3342
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
3343
- index c7b9549dd3a..591cd4177d9 100644
3343
+ index a45527d7315..8101322347e 100644
3344
3344
--- a/Lib/test/test_signal.py
3345
3345
+++ b/Lib/test/test_signal.py
3346
3346
@@ -13,9 +13,10 @@
@@ -3356,7 +3356,7 @@ index c7b9549dd3a..591cd4177d9 100644
3356
3356
try:
3357
3357
import _testcapi
3358
3358
except ImportError:
3359
- @@ -832 ,7 +833 ,7 @@
3359
+ @@ -834 ,7 +835 ,7 @@
3360
3360
self.assertEqual(self.hndl_called, True)
3361
3361
3362
3362
# Issue 3864, unknown if this affects earlier versions of freebsd also
@@ -3365,7 +3365,7 @@ index c7b9549dd3a..591cd4177d9 100644
3365
3365
'itimer not reliable (does not mix well with threading) on some BSDs.')
3366
3366
def test_itimer_virtual(self):
3367
3367
self.itimer = signal.ITIMER_VIRTUAL
3368
- @@ -1344 ,7 +1345 ,7 @@
3368
+ @@ -1346 ,7 +1347 ,7 @@
3369
3369
# Python handler
3370
3370
self.assertEqual(len(sigs), N, "Some signals were lost")
3371
3371
@@ -3375,7 +3375,7 @@ index c7b9549dd3a..591cd4177d9 100644
3375
3375
"test needs SIGUSR1")
3376
3376
@threading_helper.requires_working_threading()
3377
3377
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
3378
- index 545564094e1..63418d702c8 100644
3378
+ index acfa1cd503b..45cfa075803 100644
3379
3379
--- a/Lib/test/test_socket.py
3380
3380
+++ b/Lib/test/test_socket.py
3381
3381
@@ -3,6 +3,7 @@
@@ -4191,12 +4191,12 @@ index 0a310000751..83a2bc469ae 100644
4191
4191
}
4192
4192
-
4193
4193
diff --git a/Python/marshal.c b/Python/marshal.c
4194
- index 8ecdb738147..79ae624c975 100644
4194
+ index 3fc3f890422..892debe38dc 100644
4195
4195
--- a/Python/marshal.c
4196
4196
+++ b/Python/marshal.c
4197
- @@ -15,6 +15,10 @@
4198
- #include "pycore_hashtable.h" // _Py_hashtable_t
4197
+ @@ -16,6 +16,10 @@
4199
4198
#include "marshal.h" // Py_MARSHAL_VERSION
4199
+ #include "pycore_pystate.h" // _PyInterpreterState_GET()
4200
4200
4201
4201
+ #ifdef __APPLE__
4202
4202
+ # include "TargetConditionals.h"
@@ -4205,7 +4205,7 @@ index 8ecdb738147..79ae624c975 100644
4205
4205
/*[clinic input]
4206
4206
module marshal
4207
4207
[clinic start generated code]*/
4208
- @@ -34 ,11 +38 ,14 @@
4208
+ @@ -35 ,11 +39 ,14 @@
4209
4209
* #if defined(MS_WINDOWS) && defined(_DEBUG)
4210
4210
*/
4211
4211
#if defined(MS_WINDOWS)
@@ -4224,7 +4224,7 @@ index 8ecdb738147..79ae624c975 100644
4224
4224
4225
4225
#define TYPE_NULL '0'
4226
4226
diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h
4227
- index ed4a0ac2dd3..bc8da328ba9 100644
4227
+ index 1b1a1bdee78..47372fae53e 100644
4228
4228
--- a/Python/stdlib_module_names.h
4229
4229
+++ b/Python/stdlib_module_names.h
4230
4230
@@ -39,6 +39,7 @@
@@ -4769,7 +4769,7 @@ index d74fb6deac9..1bb6a05dc11 100755
4769
4769
4770
4770
# Local variables:
4771
4771
diff --git a/configure b/configure
4772
- index 4dfaeecfc0b..97f6ed048ad 100755
4772
+ index 1c75810d9e8..e7785926f05 100755
4773
4773
--- a/configure
4774
4774
+++ b/configure
4775
4775
@@ -975,10 +975,14 @@
@@ -6072,7 +6072,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6072
6072
6073
6073
# check for long file support functions
6074
6074
ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
6075
- @@ -22197 ,6 +22626 ,11 @@
6075
+ @@ -22199 ,6 +22628 ,11 @@
6076
6076
6077
6077
done
6078
6078
@@ -6084,7 +6084,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6084
6084
6085
6085
for ac_func in clock_settime
6086
6086
do :
6087
- @@ -22207 ,7 +22641 ,7 @@
6087
+ @@ -22209 ,7 +22643 ,7 @@
6088
6088
6089
6089
else $as_nop
6090
6090
@@ -6093,7 +6093,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6093
6093
printf %s "checking for clock_settime in -lrt... " >&6; }
6094
6094
if test ${ac_cv_lib_rt_clock_settime+y}
6095
6095
then :
6096
- @@ -22245 ,7 +22679 ,7 @@
6096
+ @@ -22247 ,7 +22681 ,7 @@
6097
6097
if test "x$ac_cv_lib_rt_clock_settime" = xyes
6098
6098
then :
6099
6099
@@ -6102,15 +6102,15 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6102
6102
6103
6103
6104
6104
fi
6105
- @@ -22254 ,6 +22688 ,7 @@
6105
+ @@ -22256 ,6 +22690 ,7 @@
6106
6106
fi
6107
6107
6108
6108
done
6109
6109
+ fi
6110
6110
6111
6111
6112
6112
for ac_func in clock_nanosleep
6113
- @@ -22475 ,7 +22910 ,9 @@
6113
+ @@ -22477 ,7 +22912 ,9 @@
6114
6114
if test "$cross_compiling" = yes
6115
6115
then :
6116
6116
@@ -6121,7 +6121,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6121
6121
ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
6122
6122
else
6123
6123
ac_cv_buggy_getaddrinfo=yes
6124
- @@ -24377 ,7 +24814 ,7 @@
6124
+ @@ -24379 ,7 +24816 ,7 @@
6125
6125
printf "%s\n" "$ABIFLAGS" >&6; }
6126
6126
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
6127
6127
printf %s "checking SOABI... " >&6; }
@@ -6130,7 +6130,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6130
6130
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
6131
6131
printf "%s\n" "$SOABI" >&6; }
6132
6132
6133
- @@ -24385 ,7 +24822 ,7 @@
6133
+ @@ -24387 ,7 +24824 ,7 @@
6134
6134
if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
6135
6135
# Similar to SOABI but remove "d" flag from ABIFLAGS
6136
6136
@@ -6139,7 +6139,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6139
6139
6140
6140
printf "%s\n" "#define ALT_SOABI \"${ALT_SOABI}\"" >>confdefs.h
6141
6141
6142
- @@ -27136 ,24 +27573 ,28 @@
6142
+ @@ -27138 ,24 +27575 ,28 @@
6143
6143
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
6144
6144
printf "%s\n" "$as_me: checking for device files" >&6;}
6145
6145
@@ -6180,7 +6180,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6180
6180
printf %s "checking for /dev/ptmx... " >&6; }
6181
6181
if test ${ac_cv_file__dev_ptmx+y}
6182
6182
then :
6183
- @@ -27174 ,12 +27615 ,12 @@
6183
+ @@ -27176 ,12 +27617 ,12 @@
6184
6184
6185
6185
fi
6186
6186
@@ -6196,7 +6196,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6196
6196
printf %s "checking for /dev/ptc... " >&6; }
6197
6197
if test ${ac_cv_file__dev_ptc+y}
6198
6198
then :
6199
- @@ -27200 ,10 +27641 ,11 @@
6199
+ @@ -27202 ,10 +27643 ,11 @@
6200
6200
6201
6201
fi
6202
6202
@@ -6209,7 +6209,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6209
6209
fi
6210
6210
6211
6211
if test $ac_sys_system = Darwin
6212
- @@ -27645 ,6 +28087 ,8 @@
6212
+ @@ -27647 ,6 +28089 ,8 @@
6213
6213
with_ensurepip=no ;; #(
6214
6214
WASI) :
6215
6215
with_ensurepip=no ;; #(
@@ -6218,7 +6218,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6218
6218
*) :
6219
6219
with_ensurepip=upgrade
6220
6220
;;
6221
- @@ -28586 ,6 +29030 ,27 @@
6221
+ @@ -28588 ,6 +29032 ,27 @@
6222
6222
py_cv_module_ossaudiodev=n/a
6223
6223
py_cv_module_spwd=n/a
6224
6224
;; #(
@@ -6246,7 +6246,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6246
6246
CYGWIN*) :
6247
6247
6248
6248
6249
- @@ -32332 ,6 +32797 ,9 @@
6249
+ @@ -32334 ,6 +32799 ,9 @@
6250
6250
"Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
6251
6251
"Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
6252
6252
"Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
@@ -6257,7 +6257,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755
6257
6257
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
6258
6258
"Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
6259
6259
diff --git a/configure.ac b/configure.ac
6260
- index 0d6df8e24e4..6ecb9fb8e85 100644
6260
+ index d0d54050286..46d3019c5ca 100644
6261
6261
--- a/configure.ac
6262
6262
+++ b/configure.ac
6263
6263
@@ -307,6 +307,161 @@
@@ -7375,7 +7375,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
7375
7375
7376
7376
# check for long file support functions
7377
7377
AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
7378
- @@ -5263 ,11 +5662 ,17 @@
7378
+ @@ -5265 ,11 +5664 ,17 @@
7379
7379
])
7380
7380
])
7381
7381
@@ -7398,7 +7398,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
7398
7398
7399
7399
AC_CHECK_FUNCS([clock_nanosleep], [], [
7400
7400
AC_CHECK_LIB([rt], [clock_nanosleep], [
7401
- @@ -5413 ,7 +5818 ,9 @@
7401
+ @@ -5415 ,7 +5820 ,9 @@
7402
7402
[ac_cv_buggy_getaddrinfo=no],
7403
7403
[ac_cv_buggy_getaddrinfo=yes],
7404
7404
[
@@ -7409,7 +7409,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
7409
7409
ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
7410
7410
else
7411
7411
ac_cv_buggy_getaddrinfo=yes
7412
- @@ -5968 ,14 +6375 ,14 @@
7412
+ @@ -5970 ,14 +6377 ,14 @@
7413
7413
AC_MSG_CHECKING([ABIFLAGS])
7414
7414
AC_MSG_RESULT([$ABIFLAGS])
7415
7415
AC_MSG_CHECKING([SOABI])
@@ -7426,7 +7426,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
7426
7426
AC_DEFINE_UNQUOTED([ALT_SOABI], ["${ALT_SOABI}"],
7427
7427
[Alternative SOABI used in debug build to load C extensions built in release mode])
7428
7428
fi
7429
- @@ -6624 ,28 +7031 ,35 @@
7429
+ @@ -6626 ,28 +7033 ,35 @@
7430
7430
AC_MSG_NOTICE([checking for device files])
7431
7431
7432
7432
dnl NOTE: Inform user how to proceed with files when cross compiling.
@@ -7482,15 +7482,15 @@ index 0d6df8e24e4..6ecb9fb8e85 100644
7482
7482
fi
7483
7483
7484
7484
if test $ac_sys_system = Darwin
7485
- @@ -6917 ,6 +7331 ,7 @@
7485
+ @@ -6919 ,6 +7333 ,7 @@
7486
7486
AS_CASE([$ac_sys_system],
7487
7487
[Emscripten], [with_ensurepip=no],
7488
7488
[WASI], [with_ensurepip=no],
7489
7489
+ [iOS|tvOS|watchOS], [with_ensurepip=no],
7490
7490
[with_ensurepip=upgrade]
7491
7491
)
7492
7492
])
7493
- @@ -7259 ,6 +7674 ,28 @@
7493
+ @@ -7261 ,6 +7676 ,28 @@
7494
7494
[AIX], [PY_STDLIB_MOD_SET_NA([_scproxy], [spwd])],
7495
7495
[VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [_crypt], [termios], [grp])],
7496
7496
[Darwin], [PY_STDLIB_MOD_SET_NA([ossaudiodev], [spwd])],
0 commit comments