1
1
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
2
- index 10d7deaecd..3fe0869081 100644
2
+ index e23500d433..411e78ada2 100644
3
3
--- a/Doc/library/os.rst
4
4
+++ b/Doc/library/os.rst
5
5
@@ -3088,6 +3088,13 @@
@@ -17,7 +17,7 @@ index 10d7deaecd..3fe0869081 100644
17
17
.. function:: execl(path, arg0, arg1, ...)
18
18
execle(path, arg0, arg1, ..., env)
19
19
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
20
- index f9ace66295..4cc682aae8 100644
20
+ index 69737820f3..f95e5b080c 100644
21
21
--- a/Doc/library/subprocess.rst
22
22
+++ b/Doc/library/subprocess.rst
23
23
@@ -25,6 +25,11 @@
@@ -723,10 +723,10 @@ index 66a16a6839..dd6444892d 100644
723
723
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
724
724
725
725
diff --git a/Lib/os.py b/Lib/os.py
726
- index b93f95d98e..7b720dbc10 100644
726
+ index 9853e37c61..7d569e55d5 100644
727
727
--- a/Lib/os.py
728
728
+++ b/Lib/os.py
729
- @@ -32 ,7 +32 ,7 @@
729
+ @@ -34 ,7 +34 ,7 @@
730
730
__all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
731
731
"defpath", "name", "path", "devnull", "SEEK_SET", "SEEK_CUR",
732
732
"SEEK_END", "fsencode", "fsdecode", "get_exec_path", "fdopen",
@@ -735,7 +735,7 @@ index b93f95d98e..7b720dbc10 100644
735
735
736
736
def _exists(name):
737
737
return name in globals()
738
- @@ -830 ,6 +830 ,13 @@
738
+ @@ -832 ,6 +832 ,13 @@
739
739
fsencode, fsdecode = _fscodec()
740
740
del _fscodec
741
741
@@ -11421,7 +11421,7 @@ index 878658827c..0bc557f9e0 100644
11421
11421
return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
11422
11422
11423
11423
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
11424
- index d1b6de5785..be92dae3e0 100644
11424
+ index 3f99be551c..447fd60f35 100644
11425
11425
--- a/Lib/subprocess.py
11426
11426
+++ b/Lib/subprocess.py
11427
11427
@@ -686,6 +686,9 @@
@@ -11764,10 +11764,10 @@ index 66a6bc1680..305c4ac734 100644
11764
11764
11765
11765
ignore_warnings = mock.patch.object(log.logger, "warning")
11766
11766
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
11767
- index 2a4cc2acad..2cb0dfce2c 100644
11767
+ index 7dba6635d4..1b03cf62ea 100644
11768
11768
--- a/Lib/test/test_base64.py
11769
11769
+++ b/Lib/test/test_base64.py
11770
- @@ -651 ,7 +651 ,7 @@
11770
+ @@ -652 ,7 +652 ,7 @@
11771
11771
def test_ErrorHeritage(self):
11772
11772
self.assertTrue(issubclass(binascii.Error, ValueError))
11773
11773
@@ -11857,7 +11857,7 @@ index 95cdc8db7e..d0b16bb5a4 100644
11857
11857
code = """if 1:
11858
11858
import os, sys
11859
11859
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
11860
- index 2e2552303f..ab04a0d078 100644
11860
+ index 07c31cedb1..cccbda6566 100644
11861
11861
--- a/Lib/test/test_compileall.py
11862
11862
+++ b/Lib/test/test_compileall.py
11863
11863
@@ -172,7 +172,8 @@
@@ -11871,18 +11871,18 @@ index 2e2552303f..ab04a0d078 100644
11871
11871
"workers must be greater or equal to 0"):
11872
11872
compileall.compile_dir(self.directory, workers=-1)
11873
11873
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
11874
- index ad68909161..5273b06ab4 100644
11874
+ index b42670e16a..ba455da328 100644
11875
11875
--- a/Lib/test/test_concurrent_futures.py
11876
11876
+++ b/Lib/test/test_concurrent_futures.py
11877
- @@ -151 ,6 +151 ,7 @@
11877
+ @@ -150 ,6 +150 ,7 @@
11878
11878
executor_type = futures.ThreadPoolExecutor
11879
11879
11880
11880
11881
11881
[email protected] (os.allows_subprocesses, 'Test requires support for subprocesses.')
11882
11882
class ProcessPoolForkMixin(ExecutorMixin):
11883
11883
executor_type = futures.ProcessPoolExecutor
11884
11884
ctx = "fork"
11885
- @@ -161 ,11 +162 ,13 @@
11885
+ @@ -160 ,11 +161 ,13 @@
11886
11886
return super().get_context()
11887
11887
11888
11888
@@ -11897,10 +11897,10 @@ index ad68909161..5273b06ab4 100644
11897
11897
executor_type = futures.ProcessPoolExecutor
11898
11898
ctx = "forkserver"
11899
11899
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
11900
- index 4a3c488738..0fb782c679 100644
11900
+ index 5f891c50d8..21adddc9fa 100644
11901
11901
--- a/Lib/test/test_doctest.py
11902
11902
+++ b/Lib/test/test_doctest.py
11903
- @@ -2729 ,7 +2729 ,12 @@
11903
+ @@ -2733 ,7 +2733 ,12 @@
11904
11904
TestResults(failed=1, attempted=1)
11905
11905
"""
11906
11906
@@ -12097,7 +12097,7 @@ index 9ad05fadef..05d1ba1f82 100644
12097
12097
"""Test loading extension modules with multi-phase initialization (PEP 489)
12098
12098
"""
12099
12099
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
12100
- index 42002b9acf..9533cc5bb6 100644
12100
+ index 7d50037bd7..b508070260 100644
12101
12101
--- a/Lib/test/test_io.py
12102
12102
+++ b/Lib/test/test_io.py
12103
12103
@@ -591,7 +591,7 @@
@@ -12134,7 +12134,7 @@ index af99f52c63..2b901e180b 100644
12134
12134
proc = subprocess.Popen([sys.executable,
12135
12135
KEYWORD_FILE,
12136
12136
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
12137
- index 546cea98c1..f662f5edf3 100644
12137
+ index c24a302868..976ab38633 100644
12138
12138
--- a/Lib/test/test_logging.py
12139
12139
+++ b/Lib/test/test_logging.py
12140
12140
@@ -1735,9 +1735,21 @@
@@ -12280,7 +12280,7 @@ index 6558952308..a121e8c2dd 100644
12280
12280
12281
12281
from test import support
12282
12282
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
12283
- index df4bad7a8c..b670ab83d5 100644
12283
+ index 411e5aa507..ca91743a04 100644
12284
12284
--- a/Lib/test/test_os.py
12285
12285
+++ b/Lib/test/test_os.py
12286
12286
@@ -696,6 +696,7 @@
@@ -12832,7 +12832,7 @@ index a0bd741c36..62fbd9f171 100644
12832
12832
sub = subprocess.Popen([sys.executable,
12833
12833
os.path.join(os.path.dirname(__file__),
12834
12834
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
12835
- index 9f494dab40..3786dd61b8 100644
12835
+ index d024158e18..709528dabf 100644
12836
12836
--- a/Lib/test/test_subprocess.py
12837
12837
+++ b/Lib/test/test_subprocess.py
12838
12838
@@ -38,6 +38,9 @@
@@ -13182,7 +13182,7 @@ index 3c4005671f..8bd3bbc952 100644
13182
13182
"""
13183
13183
Check that warnings argument of TextTestRunner correctly affects the
13184
13184
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
13185
- index 82bff835fd..93d5060fc5 100755
13185
+ index e052e51cde..a6c782d2f6 100755
13186
13186
--- a/Lib/webbrowser.py
13187
13187
+++ b/Lib/webbrowser.py
13188
13188
@@ -569,6 +569,57 @@
@@ -34003,7 +34003,7 @@ index 2e911b7be2..f8647322bc 100644
34003
34003
+ return ret;
34004
34004
+}
34005
34005
diff --git a/aclocal.m4 b/aclocal.m4
34006
- index 85a0dbba27..e1e76282b7 100644
34006
+ index 69205776ed..da05d2b19d 100644
34007
34007
--- a/aclocal.m4
34008
34008
+++ b/aclocal.m4
34009
34009
@@ -156,7 +156,7 @@
@@ -34065,10 +34065,10 @@ index ba37cf99e2..9815c16a5c 100755
34065
34065
;;
34066
34066
*)
34067
34067
diff --git a/configure b/configure
34068
- index b769d59629..e2e023f846 100755
34068
+ index 57b36e29b9..6748ceeaca 100755
34069
34069
--- a/configure
34070
34070
+++ b/configure
34071
- @@ -3256 ,6 +3256 ,15 @@
34071
+ @@ -3260 ,6 +3260 ,15 @@
34072
34072
*-*-cygwin*)
34073
34073
ac_sys_system=Cygwin
34074
34074
;;
@@ -34084,7 +34084,7 @@ index b769d59629..e2e023f846 100755
34084
34084
*)
34085
34085
# for now, limit cross builds to known configurations
34086
34086
MACHDEP="unknown"
34087
- @@ -3297 ,6 +3306 ,15 @@
34087
+ @@ -3301 ,6 +3310 ,15 @@
34088
34088
_host_cpu=$host_cpu
34089
34089
esac
34090
34090
;;
@@ -34100,7 +34100,7 @@ index b769d59629..e2e023f846 100755
34100
34100
*-*-cygwin*)
34101
34101
_host_cpu=
34102
34102
;;
34103
- @@ -3372 ,6 +3390 ,13 @@
34103
+ @@ -3376 ,6 +3394 ,13 @@
34104
34104
define_xopen_source=no;;
34105
34105
Darwin/1[0-9].*)
34106
34106
define_xopen_source=no;;
@@ -34114,7 +34114,7 @@ index b769d59629..e2e023f846 100755
34114
34114
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
34115
34115
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
34116
34116
# or has another value. By not (re)defining it, the defaults come in place.
34117
- @@ -6179 ,11 +6204 ,17 @@
34117
+ @@ -6183 ,11 +6208 ,17 @@
34118
34118
fi
34119
34119
34120
34120
if test "$cross_compiling" = yes; then
@@ -34137,7 +34137,7 @@ index b769d59629..e2e023f846 100755
34137
34137
fi
34138
34138
34139
34139
34140
- @@ -6902 ,8 +6933 ,6 @@
34140
+ @@ -6906 ,8 +6937 ,6 @@
34141
34141
# tweak BASECFLAGS based on compiler and platform
34142
34142
case $GCC in
34143
34143
yes)
@@ -34146,7 +34146,7 @@ index b769d59629..e2e023f846 100755
34146
34146
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
34147
34147
$as_echo_n "checking for -Wextra... " >&6; }
34148
34148
ac_save_cc="$CC"
34149
- @@ -11421 ,6 +11450 ,10 @@
34149
+ @@ -11447 ,6 +11476 ,10 @@
34150
34150
fi
34151
34151
;;
34152
34152
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34157,7 +34157,7 @@ index b769d59629..e2e023f846 100755
34157
34157
*)
34158
34158
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
34159
34159
# out any dynamic loading
34160
- @@ -18655 ,7 +18688 ,17 @@
34160
+ @@ -18681 ,7 +18714 ,17 @@
34161
34161
echo "creating Modules/Setup.local" >&6
34162
34162
if test ! -f Modules/Setup.local
34163
34163
then
@@ -34176,13 +34176,13 @@ index b769d59629..e2e023f846 100755
34176
34176
fi
34177
34177
34178
34178
echo "creating Makefile" >&6
34179
- @@ -18672 ,4 +18715 ,3 @@
34179
+ @@ -18698 ,4 +18741 ,3 @@
34180
34180
echo "" >&6
34181
34181
echo "" >&6
34182
34182
fi
34183
34183
-
34184
34184
diff --git a/configure.ac b/configure.ac
34185
- index 49acff3136..e8b5f627db 100644
34185
+ index f9dabd86c2..75d2b2cbc7 100644
34186
34186
--- a/configure.ac
34187
34187
+++ b/configure.ac
34188
34188
@@ -379,6 +379,15 @@
@@ -34263,7 +34263,7 @@ index 49acff3136..e8b5f627db 100644
34263
34263
AC_MSG_CHECKING(for -Wextra)
34264
34264
ac_save_cc="$CC"
34265
34265
CC="$CC -Wextra -Werror"
34266
- @@ -3521 ,6 +3550 ,10 @@
34266
+ @@ -3536 ,6 +3565 ,10 @@
34267
34267
fi
34268
34268
;;
34269
34269
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34274,7 +34274,7 @@ index 49acff3136..e8b5f627db 100644
34274
34274
*)
34275
34275
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
34276
34276
# out any dynamic loading
34277
- @@ -5705 ,7 +5738 ,17 @@
34277
+ @@ -5720 ,7 +5753 ,17 @@
34278
34278
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
34279
34279
if test ! -f Modules/Setup.local
34280
34280
then
@@ -34293,7 +34293,7 @@ index 49acff3136..e8b5f627db 100644
34293
34293
fi
34294
34294
34295
34295
echo "creating Makefile" >&AS_MESSAGE_FD
34296
- @@ -5722 ,4 +5765 ,3 @@
34296
+ @@ -5737 ,4 +5780 ,3 @@
34297
34297
echo "" >&AS_MESSAGE_FD
34298
34298
echo "" >&AS_MESSAGE_FD
34299
34299
fi
0 commit comments