Skip to content

Commit 28c05eb

Browse files
committed
Bump Python to v3.7.7.
1 parent 311dc89 commit 28c05eb

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ BUILD_NUMBER=custom
3030
MACOSX_DEPLOYMENT_TARGET=10.8
3131

3232
# Version of packages that will be compiled by this meta-package
33-
PYTHON_VERSION=3.7.6
33+
PYTHON_VERSION=3.7.7
3434
PYTHON_VER=$(basename $(PYTHON_VERSION))
3535

3636
OPENSSL_VERSION_NUMBER=1.1.1

patch/Python/Python.patch

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
2-
index 10d7deaecd..3fe0869081 100644
2+
index e23500d433..411e78ada2 100644
33
--- a/Doc/library/os.rst
44
+++ b/Doc/library/os.rst
55
@@ -3088,6 +3088,13 @@
@@ -17,7 +17,7 @@ index 10d7deaecd..3fe0869081 100644
1717
.. function:: execl(path, arg0, arg1, ...)
1818
execle(path, arg0, arg1, ..., env)
1919
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
20-
index f9ace66295..4cc682aae8 100644
20+
index 69737820f3..f95e5b080c 100644
2121
--- a/Doc/library/subprocess.rst
2222
+++ b/Doc/library/subprocess.rst
2323
@@ -25,6 +25,11 @@
@@ -723,10 +723,10 @@ index 66a16a6839..dd6444892d 100644
723723
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
724724

725725
diff --git a/Lib/os.py b/Lib/os.py
726-
index b93f95d98e..7b720dbc10 100644
726+
index 9853e37c61..7d569e55d5 100644
727727
--- a/Lib/os.py
728728
+++ b/Lib/os.py
729-
@@ -32,7 +32,7 @@
729+
@@ -34,7 +34,7 @@
730730
__all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
731731
"defpath", "name", "path", "devnull", "SEEK_SET", "SEEK_CUR",
732732
"SEEK_END", "fsencode", "fsdecode", "get_exec_path", "fdopen",
@@ -735,7 +735,7 @@ index b93f95d98e..7b720dbc10 100644
735735

736736
def _exists(name):
737737
return name in globals()
738-
@@ -830,6 +830,13 @@
738+
@@ -832,6 +832,13 @@
739739
fsencode, fsdecode = _fscodec()
740740
del _fscodec
741741

@@ -11421,7 +11421,7 @@ index 878658827c..0bc557f9e0 100644
1142111421
return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
1142211422

1142311423
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
11424-
index d1b6de5785..be92dae3e0 100644
11424+
index 3f99be551c..447fd60f35 100644
1142511425
--- a/Lib/subprocess.py
1142611426
+++ b/Lib/subprocess.py
1142711427
@@ -686,6 +686,9 @@
@@ -11764,10 +11764,10 @@ index 66a6bc1680..305c4ac734 100644
1176411764

1176511765
ignore_warnings = mock.patch.object(log.logger, "warning")
1176611766
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
11767-
index 2a4cc2acad..2cb0dfce2c 100644
11767+
index 7dba6635d4..1b03cf62ea 100644
1176811768
--- a/Lib/test/test_base64.py
1176911769
+++ b/Lib/test/test_base64.py
11770-
@@ -651,7 +651,7 @@
11770+
@@ -652,7 +652,7 @@
1177111771
def test_ErrorHeritage(self):
1177211772
self.assertTrue(issubclass(binascii.Error, ValueError))
1177311773

@@ -11857,7 +11857,7 @@ index 95cdc8db7e..d0b16bb5a4 100644
1185711857
code = """if 1:
1185811858
import os, sys
1185911859
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
11860-
index 2e2552303f..ab04a0d078 100644
11860+
index 07c31cedb1..cccbda6566 100644
1186111861
--- a/Lib/test/test_compileall.py
1186211862
+++ b/Lib/test/test_compileall.py
1186311863
@@ -172,7 +172,8 @@
@@ -11871,18 +11871,18 @@ index 2e2552303f..ab04a0d078 100644
1187111871
"workers must be greater or equal to 0"):
1187211872
compileall.compile_dir(self.directory, workers=-1)
1187311873
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
1187511875
--- a/Lib/test/test_concurrent_futures.py
1187611876
+++ b/Lib/test/test_concurrent_futures.py
11877-
@@ -151,6 +151,7 @@
11877+
@@ -150,6 +150,7 @@
1187811878
executor_type = futures.ThreadPoolExecutor
1187911879

1188011880

1188111881
[email protected](os.allows_subprocesses, 'Test requires support for subprocesses.')
1188211882
class ProcessPoolForkMixin(ExecutorMixin):
1188311883
executor_type = futures.ProcessPoolExecutor
1188411884
ctx = "fork"
11885-
@@ -161,11 +162,13 @@
11885+
@@ -160,11 +161,13 @@
1188611886
return super().get_context()
1188711887

1188811888

@@ -11897,10 +11897,10 @@ index ad68909161..5273b06ab4 100644
1189711897
executor_type = futures.ProcessPoolExecutor
1189811898
ctx = "forkserver"
1189911899
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
11900-
index 4a3c488738..0fb782c679 100644
11900+
index 5f891c50d8..21adddc9fa 100644
1190111901
--- a/Lib/test/test_doctest.py
1190211902
+++ b/Lib/test/test_doctest.py
11903-
@@ -2729,7 +2729,12 @@
11903+
@@ -2733,7 +2733,12 @@
1190411904
TestResults(failed=1, attempted=1)
1190511905
"""
1190611906

@@ -12097,7 +12097,7 @@ index 9ad05fadef..05d1ba1f82 100644
1209712097
"""Test loading extension modules with multi-phase initialization (PEP 489)
1209812098
"""
1209912099
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
12100-
index 42002b9acf..9533cc5bb6 100644
12100+
index 7d50037bd7..b508070260 100644
1210112101
--- a/Lib/test/test_io.py
1210212102
+++ b/Lib/test/test_io.py
1210312103
@@ -591,7 +591,7 @@
@@ -12134,7 +12134,7 @@ index af99f52c63..2b901e180b 100644
1213412134
proc = subprocess.Popen([sys.executable,
1213512135
KEYWORD_FILE,
1213612136
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
12137-
index 546cea98c1..f662f5edf3 100644
12137+
index c24a302868..976ab38633 100644
1213812138
--- a/Lib/test/test_logging.py
1213912139
+++ b/Lib/test/test_logging.py
1214012140
@@ -1735,9 +1735,21 @@
@@ -12280,7 +12280,7 @@ index 6558952308..a121e8c2dd 100644
1228012280

1228112281
from test import support
1228212282
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
12283-
index df4bad7a8c..b670ab83d5 100644
12283+
index 411e5aa507..ca91743a04 100644
1228412284
--- a/Lib/test/test_os.py
1228512285
+++ b/Lib/test/test_os.py
1228612286
@@ -696,6 +696,7 @@
@@ -12832,7 +12832,7 @@ index a0bd741c36..62fbd9f171 100644
1283212832
sub = subprocess.Popen([sys.executable,
1283312833
os.path.join(os.path.dirname(__file__),
1283412834
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
12835-
index 9f494dab40..3786dd61b8 100644
12835+
index d024158e18..709528dabf 100644
1283612836
--- a/Lib/test/test_subprocess.py
1283712837
+++ b/Lib/test/test_subprocess.py
1283812838
@@ -38,6 +38,9 @@
@@ -13182,7 +13182,7 @@ index 3c4005671f..8bd3bbc952 100644
1318213182
"""
1318313183
Check that warnings argument of TextTestRunner correctly affects the
1318413184
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
13185-
index 82bff835fd..93d5060fc5 100755
13185+
index e052e51cde..a6c782d2f6 100755
1318613186
--- a/Lib/webbrowser.py
1318713187
+++ b/Lib/webbrowser.py
1318813188
@@ -569,6 +569,57 @@
@@ -34003,7 +34003,7 @@ index 2e911b7be2..f8647322bc 100644
3400334003
+ return ret;
3400434004
+}
3400534005
diff --git a/aclocal.m4 b/aclocal.m4
34006-
index 85a0dbba27..e1e76282b7 100644
34006+
index 69205776ed..da05d2b19d 100644
3400734007
--- a/aclocal.m4
3400834008
+++ b/aclocal.m4
3400934009
@@ -156,7 +156,7 @@
@@ -34065,10 +34065,10 @@ index ba37cf99e2..9815c16a5c 100755
3406534065
;;
3406634066
*)
3406734067
diff --git a/configure b/configure
34068-
index b769d59629..e2e023f846 100755
34068+
index 57b36e29b9..6748ceeaca 100755
3406934069
--- a/configure
3407034070
+++ b/configure
34071-
@@ -3256,6 +3256,15 @@
34071+
@@ -3260,6 +3260,15 @@
3407234072
*-*-cygwin*)
3407334073
ac_sys_system=Cygwin
3407434074
;;
@@ -34084,7 +34084,7 @@ index b769d59629..e2e023f846 100755
3408434084
*)
3408534085
# for now, limit cross builds to known configurations
3408634086
MACHDEP="unknown"
34087-
@@ -3297,6 +3306,15 @@
34087+
@@ -3301,6 +3310,15 @@
3408834088
_host_cpu=$host_cpu
3408934089
esac
3409034090
;;
@@ -34100,7 +34100,7 @@ index b769d59629..e2e023f846 100755
3410034100
*-*-cygwin*)
3410134101
_host_cpu=
3410234102
;;
34103-
@@ -3372,6 +3390,13 @@
34103+
@@ -3376,6 +3394,13 @@
3410434104
define_xopen_source=no;;
3410534105
Darwin/1[0-9].*)
3410634106
define_xopen_source=no;;
@@ -34114,7 +34114,7 @@ index b769d59629..e2e023f846 100755
3411434114
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3411534115
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3411634116
# or has another value. By not (re)defining it, the defaults come in place.
34117-
@@ -6179,11 +6204,17 @@
34117+
@@ -6183,11 +6208,17 @@
3411834118
fi
3411934119

3412034120
if test "$cross_compiling" = yes; then
@@ -34137,7 +34137,7 @@ index b769d59629..e2e023f846 100755
3413734137
fi
3413834138

3413934139

34140-
@@ -6902,8 +6933,6 @@
34140+
@@ -6906,8 +6937,6 @@
3414134141
# tweak BASECFLAGS based on compiler and platform
3414234142
case $GCC in
3414334143
yes)
@@ -34146,7 +34146,7 @@ index b769d59629..e2e023f846 100755
3414634146
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
3414734147
$as_echo_n "checking for -Wextra... " >&6; }
3414834148
ac_save_cc="$CC"
34149-
@@ -11421,6 +11450,10 @@
34149+
@@ -11447,6 +11476,10 @@
3415034150
fi
3415134151
;;
3415234152
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34157,7 +34157,7 @@ index b769d59629..e2e023f846 100755
3415734157
*)
3415834158
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3415934159
# out any dynamic loading
34160-
@@ -18655,7 +18688,17 @@
34160+
@@ -18681,7 +18714,17 @@
3416134161
echo "creating Modules/Setup.local" >&6
3416234162
if test ! -f Modules/Setup.local
3416334163
then
@@ -34176,13 +34176,13 @@ index b769d59629..e2e023f846 100755
3417634176
fi
3417734177

3417834178
echo "creating Makefile" >&6
34179-
@@ -18672,4 +18715,3 @@
34179+
@@ -18698,4 +18741,3 @@
3418034180
echo "" >&6
3418134181
echo "" >&6
3418234182
fi
3418334183
-
3418434184
diff --git a/configure.ac b/configure.ac
34185-
index 49acff3136..e8b5f627db 100644
34185+
index f9dabd86c2..75d2b2cbc7 100644
3418634186
--- a/configure.ac
3418734187
+++ b/configure.ac
3418834188
@@ -379,6 +379,15 @@
@@ -34263,7 +34263,7 @@ index 49acff3136..e8b5f627db 100644
3426334263
AC_MSG_CHECKING(for -Wextra)
3426434264
ac_save_cc="$CC"
3426534265
CC="$CC -Wextra -Werror"
34266-
@@ -3521,6 +3550,10 @@
34266+
@@ -3536,6 +3565,10 @@
3426734267
fi
3426834268
;;
3426934269
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34274,7 +34274,7 @@ index 49acff3136..e8b5f627db 100644
3427434274
*)
3427534275
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3427634276
# out any dynamic loading
34277-
@@ -5705,7 +5738,17 @@
34277+
@@ -5720,7 +5753,17 @@
3427834278
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
3427934279
if test ! -f Modules/Setup.local
3428034280
then
@@ -34293,7 +34293,7 @@ index 49acff3136..e8b5f627db 100644
3429334293
fi
3429434294

3429534295
echo "creating Makefile" >&AS_MESSAGE_FD
34296-
@@ -5722,4 +5765,3 @@
34296+
@@ -5737,4 +5780,3 @@
3429734297
echo "" >&AS_MESSAGE_FD
3429834298
echo "" >&AS_MESSAGE_FD
3429934299
fi

0 commit comments

Comments
 (0)