@@ -11404,7 +11404,7 @@ 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 eecb1e7f25..1d3b59c73a 100644
11407
+ index d4d04a5c34..c5ac3d1525 100644
11408
11408
--- a/Lib/subprocess.py
11409
11409
+++ b/Lib/subprocess.py
11410
11410
@@ -741,6 +741,9 @@
@@ -11417,7 +11417,7 @@ index eecb1e7f25..1d3b59c73a 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
- @@ -1725 ,7 +1728 ,7 @@
11420
+ @@ -1723 ,7 +1726 ,7 @@
11421
11421
raise SubprocessError("Unknown child exit status!")
11422
11422
11423
11423
@@ -11426,7 +11426,7 @@ index eecb1e7f25..1d3b59c73a 100644
11426
11426
_WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
11427
11427
"""Check if child process has terminated. Returns returncode
11428
11428
attribute.
11429
- @@ -1734 ,6 +1737 ,8 @@
11429
+ @@ -1732 ,6 +1735 ,8 @@
11430
11430
outside of the local scope (nor can any methods it calls).
11431
11431
11432
11432
"""
@@ -11770,7 +11770,7 @@ index 7547127018..8032f9182b 100644
11770
11770
11771
11771
@support.reap_threads
11772
11772
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
11773
- index a5ece9bd61..0ab52db757 100644
11773
+ index 871a9c7a25..ea2052bf90 100644
11774
11774
--- a/Lib/test/test_cmd_line.py
11775
11775
+++ b/Lib/test/test_cmd_line.py
11776
11776
@@ -66,6 +66,7 @@
@@ -11797,31 +11797,31 @@ index a5ece9bd61..0ab52db757 100644
11797
11797
def test_undecodable_code(self):
11798
11798
undecodable = b"\xff"
11799
11799
env = os.environ.copy()
11800
- @@ -223 ,6 +226 ,7 @@
11801
- )
11802
- check_output(text )
11800
+ @@ -257 ,6 +260 ,7 @@
11801
+ self.assertEqual(stdout, expected )
11802
+ self.assertEqual(p.returncode, 0 )
11803
11803
11804
11804
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
11805
11805
def test_unbuffered_output(self):
11806
11806
# Test expected operation of the '-u' switch
11807
11807
for stream in ('stdout', 'stderr'):
11808
- @@ -281 ,6 +285 ,7 @@
11808
+ @@ -315 ,6 +319 ,7 @@
11809
11809
# for empty and unset PYTHONPATH
11810
11810
self.assertEqual(out1, out2)
11811
11811
11812
11812
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
11813
11813
def test_displayhook_unencodable(self):
11814
11814
for encoding in ('ascii', 'latin-1', 'utf-8'):
11815
11815
env = os.environ.copy()
11816
- @@ -299 ,6 +304 ,7 @@
11816
+ @@ -333 ,6 +338 ,7 @@
11817
11817
escaped = repr(text).encode(encoding, 'backslashreplace')
11818
11818
self.assertIn(escaped, data)
11819
11819
11820
11820
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
11821
11821
def check_input(self, code, expected):
11822
11822
with tempfile.NamedTemporaryFile("wb+") as stdin:
11823
11823
sep = os.linesep.encode('ASCII')
11824
- @@ -374 ,6 +380 ,7 @@
11824
+ @@ -408 ,6 +414 ,7 @@
11825
11825
@unittest.skipIf(os.name != 'posix', "test needs POSIX semantics")
11826
11826
@unittest.skipIf(sys.platform == "vxworks",
11827
11827
"test needs preexec support in subprocess.Popen")
@@ -12062,7 +12062,7 @@ index 9ad05fadef..05d1ba1f82 100644
12062
12062
"""Test loading extension modules with multi-phase initialization (PEP 489)
12063
12063
"""
12064
12064
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
12065
- index 8eef332b8e..4b78f00fbc 100644
12065
+ index 9d79caac8c..a7ee4f2f09 100644
12066
12066
--- a/Lib/test/test_io.py
12067
12067
+++ b/Lib/test/test_io.py
12068
12068
@@ -600,7 +600,7 @@
@@ -12586,10 +12586,10 @@ index 458998a62f..577cf5f385 100644
12586
12586
cmd = 'for i in 0 1 2 3 4 5 6 7 8 9; do echo testing...; sleep 1; done'
12587
12587
with os.popen(cmd) as p:
12588
12588
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
12589
- index 77306170d9..4b865f4769 100644
12589
+ index 37940c8dcf..f975f7befe 100644
12590
12590
--- a/Lib/test/test_shutil.py
12591
12591
+++ b/Lib/test/test_shutil.py
12592
- @@ -1660 ,6 +1660 ,8 @@
12592
+ @@ -1662 ,6 +1662 ,8 @@
12593
12593
self.assertEqual(['pol'], os.listdir(rv))
12594
12594
12595
12595
@@ -12598,7 +12598,7 @@ index 77306170d9..4b865f4769 100644
12598
12598
class TestWhich(unittest.TestCase):
12599
12599
12600
12600
def setUp(self):
12601
- @@ -2513 ,6 +2515 ,7 @@
12601
+ @@ -2550 ,6 +2552 ,7 @@
12602
12602
self.assertGreaterEqual(size.lines, 0)
12603
12603
12604
12604
@unittest.skipUnless(os.isatty(sys.__stdout__.fileno()), "not on tty")
@@ -12750,7 +12750,7 @@ index f9370d8e52..f6d1637f64 100644
12750
12750
class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,
12751
12751
SendrecvmsgUnixStreamTestBase):
12752
12752
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
12753
- index 8aed4b61a2..da0b9a047b 100644
12753
+ index 1e5224df01..3cd83042d8 100644
12754
12754
--- a/Lib/test/test_socketserver.py
12755
12755
+++ b/Lib/test/test_socketserver.py
12756
12756
@@ -8,6 +8,7 @@
@@ -12828,7 +12828,7 @@ index 2accad1aee..4824b6c8d0 100644
12828
12828
import distutils.text_file
12829
12829
import distutils.unixccompiler
12830
12830
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
12831
- index af0e54bd0e..6f4fbdf718 100644
12831
+ index 140c65aa3b..2301adde7b 100644
12832
12832
--- a/Lib/test/test_sys.py
12833
12833
+++ b/Lib/test/test_sys.py
12834
12834
@@ -108,6 +108,7 @@
@@ -33963,10 +33963,10 @@ index a9ba7a436f..e40b6b95cd 100644
33963
33963
+ return ret;
33964
33964
+}
33965
33965
diff --git a/aclocal.m4 b/aclocal.m4
33966
- index f98db73656..31ea12d06c 100644
33966
+ index 04342a4982..b027647376 100644
33967
33967
--- a/aclocal.m4
33968
33968
+++ b/aclocal.m4
33969
- @@ -156 ,7 +156 ,7 @@
33969
+ @@ -365 ,7 +365 ,7 @@
33970
33970
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
33971
33971
33972
33972
pkg_failed=no
@@ -33975,7 +33975,7 @@ index f98db73656..31ea12d06c 100644
33975
33975
33976
33976
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
33977
33977
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
33978
- @@ -166 ,11 +166 ,11 @@
33978
+ @@ -375 ,11 +375 ,11 @@
33979
33979
See the pkg-config man page for more details.])
33980
33980
33981
33981
if test $pkg_failed = yes; then
@@ -33989,7 +33989,7 @@ index f98db73656..31ea12d06c 100644
33989
33989
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
33990
33990
fi
33991
33991
# Put the nasty error message in config.log where it belongs
33992
- @@ -187 ,7 +187 ,7 @@
33992
+ @@ -396 ,7 +396 ,7 @@
33993
33993
_PKG_TEXT])[]dnl
33994
33994
])
33995
33995
elif test $pkg_failed = untried; then
@@ -34025,10 +34025,10 @@ index ba37cf99e2..9815c16a5c 100755
34025
34025
;;
34026
34026
*)
34027
34027
diff --git a/configure b/configure
34028
- index c164d68c4e..132ca95186 100755
34028
+ index c737256c15..d8d542e7cc 100755
34029
34029
--- a/configure
34030
34030
+++ b/configure
34031
- @@ -3275 ,6 +3275 ,15 @@
34031
+ @@ -3263 ,6 +3263 ,15 @@
34032
34032
*-*-cygwin*)
34033
34033
ac_sys_system=Cygwin
34034
34034
;;
@@ -34044,7 +34044,7 @@ index c164d68c4e..132ca95186 100755
34044
34044
*-*-vxworks*)
34045
34045
ac_sys_system=VxWorks
34046
34046
;;
34047
- @@ -3325 ,6 +3334 ,15 @@
34047
+ @@ -3313 ,6 +3322 ,15 @@
34048
34048
*-*-cygwin*)
34049
34049
_host_cpu=
34050
34050
;;
@@ -34060,7 +34060,7 @@ index c164d68c4e..132ca95186 100755
34060
34060
*-*-vxworks*)
34061
34061
_host_cpu=$host_cpu
34062
34062
;;
34063
- @@ -3400 ,6 +3418 ,13 @@
34063
+ @@ -3388 ,6 +3406 ,13 @@
34064
34064
define_xopen_source=no;;
34065
34065
Darwin/[12][0-9].*)
34066
34066
define_xopen_source=no;;
@@ -34074,7 +34074,7 @@ index c164d68c4e..132ca95186 100755
34074
34074
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
34075
34075
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
34076
34076
# or has another value. By not (re)defining it, the defaults come in place.
34077
- @@ -6169 ,11 +6194 ,17 @@
34077
+ @@ -6157 ,11 +6182 ,17 @@
34078
34078
fi
34079
34079
34080
34080
if test "$cross_compiling" = yes; then
@@ -34097,7 +34097,7 @@ index c164d68c4e..132ca95186 100755
34097
34097
fi
34098
34098
34099
34099
34100
- @@ -6924 ,8 +6955 ,6 @@
34100
+ @@ -6912 ,8 +6943 ,6 @@
34101
34101
# tweak BASECFLAGS based on compiler and platform
34102
34102
case $GCC in
34103
34103
yes)
@@ -34106,7 +34106,7 @@ index c164d68c4e..132ca95186 100755
34106
34106
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
34107
34107
$as_echo_n "checking for -Wextra... " >&6; }
34108
34108
ac_save_cc="$CC"
34109
- @@ -11488 ,6 +11517 ,10 @@
34109
+ @@ -11476 ,6 +11505 ,10 @@
34110
34110
fi
34111
34111
;;
34112
34112
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34117,7 +34117,7 @@ index c164d68c4e..132ca95186 100755
34117
34117
*)
34118
34118
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
34119
34119
# out any dynamic loading
34120
- @@ -18720 ,7 +18753 ,17 @@
34120
+ @@ -18709 ,7 +18742 ,17 @@
34121
34121
echo "creating Modules/Setup.local" >&6
34122
34122
if test ! -f Modules/Setup.local
34123
34123
then
@@ -34136,16 +34136,16 @@ index c164d68c4e..132ca95186 100755
34136
34136
fi
34137
34137
34138
34138
echo "creating Makefile" >&6
34139
- @@ -18737 ,4 +18780 ,3 @@
34139
+ @@ -18726 ,4 +18769 ,3 @@
34140
34140
echo "" >&6
34141
34141
echo "" >&6
34142
34142
fi
34143
34143
-
34144
34144
diff --git a/configure.ac b/configure.ac
34145
- index fc082a3cd2..9dcb1e6668 100644
34145
+ index 040ddfc791..3305f18b9a 100644
34146
34146
--- a/configure.ac
34147
34147
+++ b/configure.ac
34148
- @@ -379 ,6 +379 ,15 @@
34148
+ @@ -386 ,6 +386 ,15 @@
34149
34149
*-*-cygwin*)
34150
34150
ac_sys_system=Cygwin
34151
34151
;;
@@ -34161,7 +34161,7 @@ index fc082a3cd2..9dcb1e6668 100644
34161
34161
*-*-vxworks*)
34162
34162
ac_sys_system=VxWorks
34163
34163
;;
34164
- @@ -428 ,6 +437 ,15 @@
34164
+ @@ -435 ,6 +444 ,15 @@
34165
34165
*-*-cygwin*)
34166
34166
_host_cpu=
34167
34167
;;
@@ -34177,7 +34177,7 @@ index fc082a3cd2..9dcb1e6668 100644
34177
34177
*-*-vxworks*)
34178
34178
_host_cpu=$host_cpu
34179
34179
;;
34180
- @@ -500 ,6 +518 ,13 @@
34180
+ @@ -507 ,6 +525 ,13 @@
34181
34181
define_xopen_source=no;;
34182
34182
Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
34183
34183
define_xopen_source=no;;
@@ -34191,7 +34191,7 @@ index fc082a3cd2..9dcb1e6668 100644
34191
34191
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
34192
34192
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
34193
34193
# or has another value. By not (re)defining it, the defaults come in place.
34194
- @@ -1186 ,11 +1211 ,17 @@
34194
+ @@ -1193 ,11 +1218 ,17 @@
34195
34195
34196
34196
AC_CHECK_TOOLS([READELF], [readelf], [:])
34197
34197
if test "$cross_compiling" = yes; then
@@ -34214,7 +34214,7 @@ index fc082a3cd2..9dcb1e6668 100644
34214
34214
fi
34215
34215
AC_SUBST(READELF)
34216
34216
34217
- @@ -1569 ,8 +1600 ,6 @@
34217
+ @@ -1576 ,8 +1607 ,6 @@
34218
34218
# tweak BASECFLAGS based on compiler and platform
34219
34219
case $GCC in
34220
34220
yes)
@@ -34223,7 +34223,7 @@ index fc082a3cd2..9dcb1e6668 100644
34223
34223
AC_MSG_CHECKING(for -Wextra)
34224
34224
ac_save_cc="$CC"
34225
34225
CC="$CC -Wextra -Werror"
34226
- @@ -3532 ,6 +3561 ,10 @@
34226
+ @@ -3539 ,6 +3568 ,10 @@
34227
34227
fi
34228
34228
;;
34229
34229
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34234,7 +34234,7 @@ index fc082a3cd2..9dcb1e6668 100644
34234
34234
*)
34235
34235
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
34236
34236
# out any dynamic loading
34237
- @@ -5658 ,7 +5691 ,17 @@
34237
+ @@ -5665 ,7 +5698 ,17 @@
34238
34238
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
34239
34239
if test ! -f Modules/Setup.local
34240
34240
then
@@ -34253,7 +34253,7 @@ index fc082a3cd2..9dcb1e6668 100644
34253
34253
fi
34254
34254
34255
34255
echo "creating Makefile" >&AS_MESSAGE_FD
34256
- @@ -5675 ,4 +5718 ,3 @@
34256
+ @@ -5682 ,4 +5725 ,3 @@
34257
34257
echo "" >&AS_MESSAGE_FD
34258
34258
echo "" >&AS_MESSAGE_FD
34259
34259
fi
0 commit comments