1
1
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
2
- index 1a6ff40bf0..f77124656f 100644
2
+ index 45213a664e..2acf3a582a 100644
3
3
--- a/Doc/library/os.rst
4
4
+++ b/Doc/library/os.rst
5
5
@@ -3147,6 +3147,13 @@
@@ -17,7 +17,7 @@ index 1a6ff40bf0..f77124656f 100644
17
17
.. data:: MFD_CLOEXEC
18
18
MFD_ALLOW_SEALING
19
19
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
20
- index a93a6c186f..6d6640eff4 100644
20
+ index 7ce274652d..fda0d3ac5a 100644
21
21
--- a/Doc/library/subprocess.rst
22
22
+++ b/Doc/library/subprocess.rst
23
23
@@ -25,6 +25,11 @@
@@ -223,7 +223,7 @@ index 56285b5ff8..f78a152ade 100644
223
223
def three_way_cmp(x, y):
224
224
"""Return -1 if x < y, 0 if x == y and 1 if x > y"""
225
225
diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
226
- index e4c25fd880..811af9dfd6 100644
226
+ index 38af7ac13d..db0d4986d6 100644
227
227
--- a/Lib/ctypes/test/test_parameters.py
228
228
+++ b/Lib/ctypes/test/test_parameters.py
229
229
@@ -140,7 +140,7 @@
@@ -11404,10 +11404,10 @@ index 9fa21cca38..e346fb4390 100644
11404
11404
return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
11405
11405
11406
11406
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
11407
- index 5c2c2f0509..ecc298abec 100644
11407
+ index eecb1e7f25..1d3b59c73a 100644
11408
11408
--- a/Lib/subprocess.py
11409
11409
+++ b/Lib/subprocess.py
11410
- @@ -737 ,6 +737 ,9 @@
11410
+ @@ -741 ,6 +741 ,9 @@
11411
11411
restore_signals=True, start_new_session=False,
11412
11412
pass_fds=(), *, encoding=None, errors=None, text=None):
11413
11413
"""Create new Popen instance."""
@@ -11417,7 +11417,7 @@ index 5c2c2f0509..ecc298abec 100644
11417
11417
_cleanup()
11418
11418
# Held while anything is calling waitpid before returncode has been
11419
11419
# updated to prevent clobbering returncode if wait() or poll() are
11420
- @@ -1721 ,7 +1724 ,7 @@
11420
+ @@ -1725 ,7 +1728 ,7 @@
11421
11421
raise SubprocessError("Unknown child exit status!")
11422
11422
11423
11423
@@ -11426,7 +11426,7 @@ index 5c2c2f0509..ecc298abec 100644
11426
11426
_WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
11427
11427
"""Check if child process has terminated. Returns returncode
11428
11428
attribute.
11429
- @@ -1730 ,6 +1733 ,8 @@
11429
+ @@ -1734 ,6 +1737 ,8 @@
11430
11430
outside of the local scope (nor can any methods it calls).
11431
11431
11432
11432
"""
@@ -12233,7 +12233,7 @@ index 6558952308..a121e8c2dd 100644
12233
12233
12234
12234
from test import support
12235
12235
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
12236
- index 2a4ae1573e..c91e97e75c 100644
12236
+ index 5302b1ce57..ff7a7675c7 100644
12237
12237
--- a/Lib/test/test_os.py
12238
12238
+++ b/Lib/test/test_os.py
12239
12239
@@ -852,6 +852,7 @@
@@ -12317,7 +12317,7 @@ index 2a4ae1573e..c91e97e75c 100644
12317
12317
"""Check if stty returns the same results
12318
12318
12319
12319
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
12320
- index 9c9471a8cc..cfa6866dd1 100644
12320
+ index f77c355077..643dec376a 100644
12321
12321
--- a/Lib/test/test_pdb.py
12322
12322
+++ b/Lib/test/test_pdb.py
12323
12323
@@ -1231,6 +1231,7 @@
@@ -12800,7 +12800,7 @@ index a0bd741c36..62fbd9f171 100644
12800
12800
sub = subprocess.Popen([sys.executable,
12801
12801
os.path.join(os.path.dirname(__file__),
12802
12802
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
12803
- index 2d3ab93555..b417233e12 100644
12803
+ index 4661d1e252..27a841e889 100644
12804
12804
--- a/Lib/test/test_subprocess.py
12805
12805
+++ b/Lib/test/test_subprocess.py
12806
12806
@@ -31,6 +31,9 @@
@@ -13639,18 +13639,18 @@ index 6023c1e138..ae5803c4c8 100755
13639
13639
+ -I$(srcdir)/Modules/_decimal/libmpdec \
13640
13640
+ -DCONFIG_32=1 -DANSI=1
13641
13641
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
13642
- index a9b8675cd9..b99d451f82 100644
13642
+ index de75918d49..9e0189b657 100644
13643
13643
--- a/Modules/_ctypes/callproc.c
13644
13644
+++ b/Modules/_ctypes/callproc.c
13645
- @@ -813 ,6 +813 ,7 @@
13645
+ @@ -800 ,6 +800 ,7 @@
13646
13646
ffi_type **atypes,
13647
13647
ffi_type *restype,
13648
13648
void *resmem,
13649
13649
+ int fixedargcount,
13650
13650
int argcount)
13651
13651
{
13652
13652
PyThreadState *_save = NULL; /* For Py_BLOCK_THREADS and Py_UNBLOCK_THREADS */
13653
- @@ -836 ,11 +837 ,12 @@
13653
+ @@ -823 ,11 +824 ,12 @@
13654
13654
if ((flags & FUNCFLAG_CDECL) == 0)
13655
13655
cc = FFI_STDCALL;
13656
13656
#endif
@@ -13668,7 +13668,7 @@ index a9b8675cd9..b99d451f82 100644
13668
13668
PyErr_SetString(PyExc_RuntimeError,
13669
13669
"ffi_prep_cif failed");
13670
13670
return -1;
13671
- @@ -1213 ,6 +1215 ,9 @@
13671
+ @@ -1200 ,6 +1202 ,9 @@
13672
13672
13673
13673
if (-1 == _call_function_pointer(flags, pProc, avalues, atypes,
13674
13674
rtype, resbuf,
0 commit comments