python: Update to 3.8.2
This commit is contained in:
Alexey Pavlov
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.7.0-orig/config.guess Python-3.7.0/config.guess
|
||||
--- Python-3.7.0-orig/config.guess 2015-02-25 14:27:46.000000000 +0300
|
||||
+++ Python-3.7.0/config.guess 2015-05-07 09:58:31.810000000 +0300
|
||||
@@ -866,6 +866,9 @@
|
||||
diff -Naur Python-3.8.2-orig/config.guess Python-3.8.2/config.guess
|
||||
--- Python-3.8.2-orig/config.guess 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/config.guess 2020-04-16 11:24:20.093487400 +0300
|
||||
@@ -883,6 +883,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-unknown-cygwin
|
||||
exit ;;
|
||||
@@ -11,38 +11,53 @@ diff -Naur Python-3.7.0-orig/config.guess Python-3.7.0/config.guess
|
||||
prep*:SunOS:5.*:*)
|
||||
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
|
||||
exit ;;
|
||||
diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
--- Python-3.6.0/configure.ac.orig 2017-02-08 09:14:49.544766100 -0500
|
||||
+++ Python-3.6.0/configure.ac 2017-02-08 09:23:26.742594900 -0500
|
||||
@@ -383,6 +383,9 @@
|
||||
diff -Naur Python-3.8.2-orig/configure.ac Python-3.8.2/configure.ac
|
||||
--- Python-3.8.2-orig/configure.ac 2020-04-16 11:05:52.937126000 +0300
|
||||
+++ Python-3.8.2/configure.ac 2020-04-16 11:55:47.954736700 +0300
|
||||
@@ -374,6 +374,9 @@
|
||||
*-*-cygwin*)
|
||||
ac_sys_system=Cygwin
|
||||
;;
|
||||
+ *-*-msys*)
|
||||
+ ac_sys_system=Msys
|
||||
+ ;;
|
||||
*)
|
||||
# for now, limit cross builds to known configurations
|
||||
MACHDEP="unknown"
|
||||
@@ -407,6 +410,7 @@
|
||||
case $MACHDEP in
|
||||
*-*-vxworks*)
|
||||
ac_sys_system=VxWorks
|
||||
;;
|
||||
@@ -402,6 +405,7 @@
|
||||
aix*) MACHDEP="aix";;
|
||||
linux*) MACHDEP="linux";;
|
||||
cygwin*) MACHDEP="cygwin";;
|
||||
+ msys*) MACHDEP="msys";;
|
||||
darwin*) MACHDEP="darwin";;
|
||||
irix646) MACHDEP="irix6";;
|
||||
'') MACHDEP="unknown";;
|
||||
@@ -428,6 +432,9 @@
|
||||
esac
|
||||
@@ -423,6 +427,9 @@
|
||||
*-*-cygwin*)
|
||||
_host_cpu=
|
||||
;;
|
||||
+ *-*-msys*)
|
||||
+ _host_cpu=
|
||||
+ ;;
|
||||
*)
|
||||
# for now, limit cross builds to known configurations
|
||||
MACHDEP="unknown"
|
||||
@@ -1087,7 +1094,7 @@
|
||||
*-*-vxworks*)
|
||||
_host_cpu=$host_cpu
|
||||
;;
|
||||
@@ -845,6 +852,14 @@
|
||||
darwin
|
||||
#elif defined(__VXWORKS__)
|
||||
vxworks
|
||||
+#elif defined(__MSYS__)
|
||||
+# if defined(__x86_64__)
|
||||
+ x86_64-msys
|
||||
+# elif defined(__i386__)
|
||||
+ i386-msys
|
||||
+# else
|
||||
+# error unknown platform triplet
|
||||
+# endif
|
||||
#elif defined(__CYGWIN__)
|
||||
# if defined(__x86_64__)
|
||||
x86_64-cygwin
|
||||
@@ -1064,7 +1071,7 @@
|
||||
if test -z "$enable_shared"
|
||||
then
|
||||
case $ac_sys_system in
|
||||
@@ -51,7 +66,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
enable_shared="yes";;
|
||||
*)
|
||||
enable_shared="no";;
|
||||
@@ -1142,6 +1149,10 @@
|
||||
@@ -1118,6 +1125,10 @@
|
||||
LDLIBRARY='libpython$(LDVERSION).dll.a'
|
||||
DLLLIBRARY='libpython$(LDVERSION).dll'
|
||||
;;
|
||||
@@ -62,7 +77,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
SunOS*)
|
||||
LDLIBRARY='libpython$(LDVERSION).so'
|
||||
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
|
||||
@@ -1188,7 +1200,7 @@
|
||||
@@ -1164,7 +1175,7 @@
|
||||
else # shared is disabled
|
||||
PY_ENABLE_SHARED=0
|
||||
case $ac_sys_system in
|
||||
@@ -71,7 +86,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
BLDLIBRARY='$(LIBRARY)'
|
||||
LDLIBRARY='libpython$(LDVERSION).dll.a'
|
||||
;;
|
||||
@@ -1238,7 +1250,7 @@
|
||||
@@ -1213,7 +1224,7 @@
|
||||
AC_SUBST(LN)
|
||||
if test -z "$LN" ; then
|
||||
case $ac_sys_system in
|
||||
@@ -80,7 +95,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
*) LN=ln;;
|
||||
esac
|
||||
fi
|
||||
@@ -2380,7 +2392,7 @@
|
||||
@@ -2507,7 +2518,7 @@
|
||||
*) SHLIB_SUFFIX=.sl;;
|
||||
esac
|
||||
;;
|
||||
@@ -89,7 +104,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
*) SHLIB_SUFFIX=.so;;
|
||||
esac
|
||||
fi
|
||||
@@ -2518,7 +2530,7 @@
|
||||
@@ -2641,7 +2652,7 @@
|
||||
SCO_SV*)
|
||||
LDSHARED='$(CC) -Wl,-G,-Bexport'
|
||||
LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
|
||||
@@ -98,7 +113,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
|
||||
LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
|
||||
*) LDSHARED="ld";;
|
||||
@@ -2606,7 +2618,7 @@
|
||||
@@ -2727,7 +2738,7 @@
|
||||
LINKFORSHARED="-Xlinker --export-dynamic"
|
||||
fi;;
|
||||
esac;;
|
||||
@@ -107,7 +122,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
if test $enable_shared = "no"
|
||||
then
|
||||
LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
|
||||
@@ -2628,7 +2640,7 @@
|
||||
@@ -2751,7 +2762,7 @@
|
||||
if test ! "$LIBRARY" = "$LDLIBRARY"
|
||||
then
|
||||
case $ac_sys_system in
|
||||
@@ -116,7 +131,7 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
# Cygwin needs CCSHARED when building extension DLLs
|
||||
# but not when building the interpreter DLL.
|
||||
CFLAGSFORSHARED='';;
|
||||
@@ -3061,7 +3073,7 @@
|
||||
@@ -3206,7 +3217,7 @@
|
||||
fi
|
||||
AC_CHECK_FUNCS(pthread_sigmask,
|
||||
[case $ac_sys_system in
|
||||
@@ -125,39 +140,51 @@ diff -Naur Python-3.6.0/configure.ac.orig Python-3.6.0/configure.ac
|
||||
AC_DEFINE(HAVE_BROKEN_PTHREAD_SIGMASK, 1,
|
||||
[Define if pthread_sigmask() does not work on your system.])
|
||||
;;
|
||||
@@ -4609,7 +4621,7 @@
|
||||
@@ -4656,7 +4667,7 @@
|
||||
|
||||
AC_SUBST(EXT_SUFFIX)
|
||||
case $ac_sys_system in
|
||||
- Linux*|GNU*|Darwin|CYGWIN*)
|
||||
+ Linux*|GNU*|Darwin|CYGWIN*|MSYS*)
|
||||
- Linux*|GNU*|Darwin|VxWorks|CYGWIN*)
|
||||
+ Linux*|GNU*|Darwin|VxWorks|CYGWIN*|MSYS*)
|
||||
EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
|
||||
*)
|
||||
EXT_SUFFIX=${SHLIB_SUFFIX};;
|
||||
diff -Naur Python-3.6.0/Lib/asyncio/base_events.py.orig Python-3.6.0/Lib/asyncio/base_events.py
|
||||
--- Python-3.6.0/Lib/asyncio/base_events.py.orig 2016-12-22 21:21:19.000000000 -0500
|
||||
+++ Python-3.6.0/Lib/asyncio/base_events.py 2017-02-08 08:59:15.247005800 -0500
|
||||
@@ -895,7 +895,7 @@
|
||||
exceptions = []
|
||||
@@ -4990,7 +4990,7 @@
|
||||
|
||||
if reuse_address is None:
|
||||
- reuse_address = os.name == 'posix' and sys.platform != 'cygwin'
|
||||
+ reuse_address = os.name == 'posix' and sys.platform != 'cygwin' and sys.platform != 'msys'
|
||||
# On Android and Cygwin the shared libraries must be linked with libpython.
|
||||
AC_SUBST(LIBPYTHON)
|
||||
-if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
|
||||
+if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "msys" -o "$MACHDEP" = "win"; then
|
||||
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
|
||||
else
|
||||
LIBPYTHON=''
|
||||
diff -Naur Python-3.8.2-orig/Lib/_pyio.py Python-3.8.2/Lib/_pyio.py
|
||||
--- Python-3.8.2-orig/Lib/_pyio.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/_pyio.py 2020-04-16 11:24:20.888354800 +0300
|
||||
@@ -10,7 +10,7 @@
|
||||
import sys
|
||||
# Import _thread instead of threading to reduce startup cost
|
||||
from _thread import allocate_lock as Lock
|
||||
-if sys.platform in {'win32', 'cygwin'}:
|
||||
+if sys.platform in {'win32', 'cygwin', 'msys'}:
|
||||
from msvcrt import setmode as _setmode
|
||||
else:
|
||||
_setmode = None
|
||||
diff -Naur Python-3.8.2-orig/Lib/asyncio/base_events.py Python-3.8.2/Lib/asyncio/base_events.py
|
||||
--- Python-3.8.2-orig/Lib/asyncio/base_events.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/asyncio/base_events.py 2020-04-16 11:24:20.187260800 +0300
|
||||
@@ -1413,7 +1413,7 @@
|
||||
'host/port and sock can not be specified at the same time')
|
||||
|
||||
for ((family, proto),
|
||||
(local_address, remote_address)) in addr_pairs_info:
|
||||
@@ -997,7 +997,7 @@
|
||||
|
||||
AF_INET6 = getattr(socket, 'AF_INET6', 0)
|
||||
if reuse_address is None:
|
||||
- reuse_address = os.name == 'posix' and sys.platform != 'cygwin'
|
||||
+ reuse_address = os.name == 'posix' and sys.platform != 'cygwin' and sys.platform != 'msys'
|
||||
sockets = []
|
||||
if host == '':
|
||||
hosts = [None]
|
||||
diff -Naur Python-3.7.0-orig/Lib/ctypes/__init__.py Python-3.7.0/Lib/ctypes/__init__.py
|
||||
--- Python-3.7.0-orig/Lib/ctypes/__init__.py 2015-05-07 09:55:34.078000000 +0300
|
||||
+++ Python-3.7.0/Lib/ctypes/__init__.py 2015-05-07 09:58:31.825600000 +0300
|
||||
diff -Naur Python-3.8.2-orig/Lib/ctypes/__init__.py Python-3.8.2/Lib/ctypes/__init__.py
|
||||
--- Python-3.8.2-orig/Lib/ctypes/__init__.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/ctypes/__init__.py 2020-04-16 12:15:47.765039500 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
"""create and manipulate C data types in Python"""
|
||||
|
||||
@@ -166,22 +193,19 @@ diff -Naur Python-3.7.0-orig/Lib/ctypes/__init__.py Python-3.7.0/Lib/ctypes/__in
|
||||
|
||||
__version__ = "1.1.0"
|
||||
|
||||
@@ -430,9 +430,8 @@
|
||||
|
||||
if _os.name == "nt":
|
||||
@@ -457,6 +457,8 @@
|
||||
pythonapi = PyDLL("python dll", None, _sys.dllhandle)
|
||||
-elif _sys.platform == "cygwin":
|
||||
- pythonapi = PyDLL("libpython%d.%d%s.dll" % \
|
||||
- (_sys.version_info[:2] + tuple(_sys.abiflags)))
|
||||
+elif _sys.platform in ['cygwin', 'msys']:
|
||||
+ pythonapi = PyDLL(_sysconfig.get_config_var('DLLLIBRARY'))
|
||||
elif _sys.platform == "cygwin":
|
||||
pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
|
||||
+elif _sys.platform == 'msys':
|
||||
+ pythonapi = PyDLL("msys-python%d.%d.dll" % _sys.version_info[:2])
|
||||
else:
|
||||
pythonapi = PyDLL(None)
|
||||
|
||||
diff -Naur Python-3.7.0-orig/Lib/ctypes/test/test_loading.py Python-3.7.0/Lib/ctypes/test/test_loading.py
|
||||
--- Python-3.7.0-orig/Lib/ctypes/test/test_loading.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/ctypes/test/test_loading.py 2015-05-07 09:58:31.841200000 +0300
|
||||
@@ -13,6 +13,8 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/ctypes/test/test_loading.py Python-3.8.2/Lib/ctypes/test/test_loading.py
|
||||
--- Python-3.8.2-orig/Lib/ctypes/test/test_loading.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/ctypes/test/test_loading.py 2020-04-16 11:24:20.297938600 +0300
|
||||
@@ -16,6 +16,8 @@
|
||||
libc_name = find_library("c")
|
||||
elif sys.platform == "cygwin":
|
||||
libc_name = "cygwin1.dll"
|
||||
@@ -190,19 +214,19 @@ diff -Naur Python-3.7.0-orig/Lib/ctypes/test/test_loading.py Python-3.7.0/Lib/ct
|
||||
else:
|
||||
libc_name = find_library("c")
|
||||
|
||||
diff -Naur Python-3.7.0-orig/Lib/ctypes/util.py Python-3.7.0/Lib/ctypes/util.py
|
||||
--- Python-3.7.0-orig/Lib/ctypes/util.py 2015-05-07 09:55:34.078000000 +0300
|
||||
+++ Python-3.7.0/Lib/ctypes/util.py 2015-05-07 10:01:40.261800000 +0300
|
||||
@@ -80,7 +80,7 @@
|
||||
continue
|
||||
return None
|
||||
diff -Naur Python-3.8.2-orig/Lib/ctypes/util.py Python-3.8.2/Lib/ctypes/util.py
|
||||
--- Python-3.8.2-orig/Lib/ctypes/util.py 2020-04-16 11:05:52.177167300 +0300
|
||||
+++ Python-3.8.2/Lib/ctypes/util.py 2020-04-16 12:13:21.118796400 +0300
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
from ctypes._aix import find_library
|
||||
|
||||
-elif sys.platform == "cygwin":
|
||||
+elif sys.platform in ["cygwin", "msys"]:
|
||||
def find_library(name):
|
||||
for libdir in ['/usr/lib', '/usr/local/lib']:
|
||||
for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]:
|
||||
@@ -351,6 +351,10 @@
|
||||
@@ -372,6 +372,10 @@
|
||||
print(cdll.LoadLibrary("cygbz2-1.dll"))
|
||||
print(cdll.LoadLibrary("cygcrypt-0.dll"))
|
||||
print(find_library("crypt"))
|
||||
@@ -210,13 +234,13 @@ diff -Naur Python-3.7.0-orig/Lib/ctypes/util.py Python-3.7.0/Lib/ctypes/util.py
|
||||
+ print(cdll.LoadLibrary("msys-bz2-1.dll"))
|
||||
+ print(cdll.LoadLibrary("msys-crypt-0.dll"))
|
||||
+ print(find_library("crypt"))
|
||||
# issue-26439 - fix broken test call for AIX
|
||||
elif sys.platform.startswith("aix"):
|
||||
from ctypes import CDLL
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/ccompiler.py Python-3.7.0/Lib/distutils/ccompiler.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/ccompiler.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/ccompiler.py 2015-05-07 09:58:31.841200000 +0300
|
||||
@@ -926,6 +926,7 @@
|
||||
else:
|
||||
print(cdll.LoadLibrary("libm.so"))
|
||||
print(cdll.LoadLibrary("libcrypt.so"))
|
||||
diff -Naur Python-3.8.2-orig/Lib/distutils/ccompiler.py Python-3.8.2/Lib/distutils/ccompiler.py
|
||||
--- Python-3.8.2-orig/Lib/distutils/ccompiler.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/distutils/ccompiler.py 2020-04-16 11:24:20.389719900 +0300
|
||||
@@ -927,6 +927,7 @@
|
||||
# on a cygwin built python we can use gcc like an ordinary UNIXish
|
||||
# compiler
|
||||
('cygwin.*', 'unix'),
|
||||
@@ -224,7 +248,7 @@ diff -Naur Python-3.7.0-orig/Lib/distutils/ccompiler.py Python-3.7.0/Lib/distuti
|
||||
|
||||
# OS name mappings
|
||||
('posix', 'unix'),
|
||||
@@ -963,6 +964,8 @@
|
||||
@@ -964,6 +965,8 @@
|
||||
"Microsoft Visual C++"),
|
||||
'cygwin': ('cygwinccompiler', 'CygwinCCompiler',
|
||||
"Cygwin port of GNU C Compiler for Win32"),
|
||||
@@ -233,10 +257,10 @@ diff -Naur Python-3.7.0-orig/Lib/distutils/ccompiler.py Python-3.7.0/Lib/distuti
|
||||
'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',
|
||||
"Mingw32 port of GNU C Compiler for Win32"),
|
||||
'bcpp': ('bcppcompiler', 'BCPPCompiler',
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/command/build_ext.py Python-3.7.0/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/command/build_ext.py 2015-05-07 09:55:34.811200000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/command/build_ext.py 2015-05-07 09:58:31.856800000 +0300
|
||||
@@ -217,7 +217,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/distutils/command/build_ext.py Python-3.8.2/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.8.2-orig/Lib/distutils/command/build_ext.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/distutils/command/build_ext.py 2020-04-16 12:23:32.423489500 +0300
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
# For extensions under Cygwin, Python's library directory must be
|
||||
# appended to library_dirs
|
||||
@@ -245,51 +269,35 @@ diff -Naur Python-3.7.0-orig/Lib/distutils/command/build_ext.py Python-3.7.0/Lib
|
||||
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
|
||||
# building third party extensions
|
||||
self.library_dirs.append(os.path.join(sys.prefix, "lib",
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/cygwinccompiler.py Python-3.7.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/cygwinccompiler.py 2015-05-07 09:55:43.001200000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/cygwinccompiler.py 2015-05-07 09:58:31.856800000 +0300
|
||||
@@ -739,12 +739,16 @@
|
||||
link_libpython = True
|
||||
elif sys.platform == 'cygwin':
|
||||
link_libpython = True
|
||||
+ elif sys.platform == 'msys':
|
||||
+ link_libpython = True
|
||||
elif '_PYTHON_HOST_PLATFORM' in os.environ:
|
||||
# We are cross-compiling for one of the relevant platforms
|
||||
if get_config_var('ANDROID_API_LEVEL') != 0:
|
||||
link_libpython = True
|
||||
elif get_config_var('MACHDEP') == 'cygwin':
|
||||
link_libpython = True
|
||||
+ elif get_config_var('MACHDEP') == 'msys':
|
||||
+ link_libpython = True
|
||||
|
||||
if link_libpython:
|
||||
ldversion = get_config_var('LDVERSION')
|
||||
diff -Naur Python-3.8.2-orig/Lib/distutils/cygwinccompiler.py Python-3.8.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.8.2-orig/Lib/distutils/cygwinccompiler.py 2020-04-16 11:05:52.457414700 +0300
|
||||
+++ Python-3.8.2/Lib/distutils/cygwinccompiler.py 2020-04-16 11:24:20.464492200 +0300
|
||||
@@ -400,4 +400,4 @@
|
||||
def is_cygwingcc():
|
||||
'''Try to determine if the gcc that would be used is from cygwin.'''
|
||||
out_string = check_output(['gcc', '-dumpmachine'])
|
||||
- return out_string.strip().endswith(b'cygwin')
|
||||
+ return (out_string.strip().endswith(b'cygwin') or out_string.strip().endswith(b'msys'))
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/sysconfig.py Python-3.7.0/Lib/distutils/sysconfig.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/sysconfig.py 2015-05-07 09:55:46.604800000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/sysconfig.py 2015-05-07 10:07:03.222600000 +0300
|
||||
@@ -157,7 +157,7 @@
|
||||
varies across Unices and is stored in Python's Makefile.
|
||||
"""
|
||||
global _config_vars
|
||||
- if compiler.compiler_type in ["cygwin", "mingw32"]:
|
||||
+ if compiler.compiler_type in ["cygwin", "msys", "mingw32"]:
|
||||
# Note that cygwin use posix build and 'unix' compiler.
|
||||
# If build is not based on posix then we must predefine
|
||||
# some environment variables corresponding to posix
|
||||
@@ -172,7 +172,7 @@
|
||||
_config_vars['AR'] = "ar"
|
||||
_config_vars['ARFLAGS'] = "rc"
|
||||
|
||||
- if compiler.compiler_type in ["unix", "cygwin", "mingw32"]:
|
||||
+ if compiler.compiler_type in ["unix", "cygwin", "msys", "mingw32"]:
|
||||
if sys.platform == "darwin":
|
||||
# Perform first-time customization of compiler-related
|
||||
# config vars on OS X now that we know we need a compiler.
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/tests/support.py Python-3.7.0/Lib/distutils/tests/support.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/tests/support.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/tests/support.py 2015-05-07 09:58:31.856800000 +0300
|
||||
@@ -65,7 +65,7 @@
|
||||
super().tearDown()
|
||||
while self.tempdirs:
|
||||
d = self.tempdirs.pop()
|
||||
- shutil.rmtree(d, os.name in ('nt', 'cygwin'))
|
||||
+ shutil.rmtree(d, os.name in ('nt', 'cygwin', 'msys'))
|
||||
|
||||
def mkdtemp(self):
|
||||
"""Create a temporary directory that will be cleaned up.
|
||||
diff -Naur Python-3.6.0/Lib/distutils/unixccompiler.py.orig Python-3.6.0/Lib/distutils/unixccompiler.py
|
||||
--- Python-3.6.0/Lib/distutils/unixccompiler.py.orig 2017-02-08 08:22:40.592815800 -0500
|
||||
+++ Python-3.6.0/Lib/distutils/unixccompiler.py 2017-02-08 08:32:38.946960100 -0500
|
||||
diff -Naur Python-3.8.2-orig/Lib/distutils/unixccompiler.py Python-3.8.2/Lib/distutils/unixccompiler.py
|
||||
--- Python-3.8.2-orig/Lib/distutils/unixccompiler.py 2020-04-16 11:05:53.222360600 +0300
|
||||
+++ Python-3.8.2/Lib/distutils/unixccompiler.py 2020-04-16 11:24:20.529346500 +0300
|
||||
@@ -79,7 +79,7 @@
|
||||
xcode_stub_lib_extension = ".tbd"
|
||||
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
|
||||
@@ -299,7 +307,7 @@ diff -Naur Python-3.6.0/Lib/distutils/unixccompiler.py.orig Python-3.6.0/Lib/dis
|
||||
exe_extension = ".exe"
|
||||
dylib_lib_extension = ".dll.a"
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
@@ -242,7 +242,7 @@
|
||||
# the configuration data stored in the Python installation, so
|
||||
# we use this hack.
|
||||
compiler = os.path.basename(sysconfig.get_config_var("CC"))
|
||||
@@ -308,10 +316,10 @@ diff -Naur Python-3.6.0/Lib/distutils/unixccompiler.py.orig Python-3.6.0/Lib/dis
|
||||
# MacOSX's linker doesn't understand the -R flag at all
|
||||
return "-L" + dir
|
||||
elif sys.platform[:7] == "freebsd":
|
||||
diff -Naur Python-3.7.0-orig/Lib/distutils/util.py Python-3.7.0/Lib/distutils/util.py
|
||||
--- Python-3.7.0-orig/Lib/distutils/util.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/distutils/util.py 2015-05-07 09:58:31.872400000 +0300
|
||||
@@ -97,6 +97,12 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/distutils/util.py Python-3.8.2/Lib/distutils/util.py
|
||||
--- Python-3.8.2-orig/Lib/distutils/util.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/distutils/util.py 2020-04-16 11:24:20.569211200 +0300
|
||||
@@ -86,6 +86,12 @@
|
||||
m = rel_re.match(release)
|
||||
if m:
|
||||
release = m.group()
|
||||
@@ -324,10 +332,10 @@ diff -Naur Python-3.7.0-orig/Lib/distutils/util.py Python-3.7.0/Lib/distutils/ut
|
||||
elif osname[:6] == "darwin":
|
||||
import _osx_support, distutils.sysconfig
|
||||
osname, release, machine = _osx_support.get_platform_osx(
|
||||
diff -Naur Python-3.6.0/Lib/importlib/_bootstrap_external.py.orig Python-3.6.0/Lib/importlib/_bootstrap_external.py
|
||||
--- Python-3.6.0/Lib/importlib/_bootstrap_external.py.orig 2017-02-08 08:43:48.316520300 -0500
|
||||
+++ Python-3.6.0/Lib/importlib/_bootstrap_external.py 2017-02-08 08:44:28.339129300 -0500
|
||||
@@ -22,7 +22,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/importlib/_bootstrap_external.py Python-3.8.2/Lib/importlib/_bootstrap_external.py
|
||||
--- Python-3.8.2-orig/Lib/importlib/_bootstrap_external.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/importlib/_bootstrap_external.py 2020-04-16 11:24:20.608135500 +0300
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
# Bootstrap-related code ######################################################
|
||||
_CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',
|
||||
@@ -335,11 +343,23 @@ diff -Naur Python-3.6.0/Lib/importlib/_bootstrap_external.py.orig Python-3.6.0/L
|
||||
+_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'msys', 'darwin'
|
||||
_CASE_INSENSITIVE_PLATFORMS = (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
|
||||
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
|
||||
|
||||
diff -Naur Python-3.7.0-orig/Lib/sysconfig.py Python-3.7.0/Lib/sysconfig.py
|
||||
--- Python-3.7.0-orig/Lib/sysconfig.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/sysconfig.py 2015-05-07 09:58:34.087600000 +0300
|
||||
@@ -683,6 +683,13 @@
|
||||
|
||||
diff -Naur Python-3.8.2-orig/Lib/socket.py Python-3.8.2/Lib/socket.py
|
||||
--- Python-3.8.2-orig/Lib/socket.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/socket.py 2020-04-16 12:25:52.240577100 +0300
|
||||
@@ -866,7 +866,7 @@
|
||||
# connections. Also, it may set the process in a state where
|
||||
# it'll no longer respond to any signals or graceful kills.
|
||||
# See: msdn2.microsoft.com/en-us/library/ms740621(VS.85).aspx
|
||||
- if os.name not in ('nt', 'cygwin') and \
|
||||
+ if os.name not in ('nt', 'cygwin', 'msys') and \
|
||||
hasattr(_socket, 'SO_REUSEADDR'):
|
||||
try:
|
||||
sock.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
|
||||
diff -Naur Python-3.8.2-orig/Lib/sysconfig.py Python-3.8.2/Lib/sysconfig.py
|
||||
--- Python-3.8.2-orig/Lib/sysconfig.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/sysconfig.py 2020-04-16 11:24:20.643039800 +0300
|
||||
@@ -673,6 +673,13 @@
|
||||
m = rel_re.match(release)
|
||||
if m:
|
||||
release = m.group()
|
||||
@@ -353,22 +373,34 @@ diff -Naur Python-3.7.0-orig/Lib/sysconfig.py Python-3.7.0/Lib/sysconfig.py
|
||||
elif osname[:6] == "darwin":
|
||||
import _osx_support
|
||||
osname, release, machine = _osx_support.get_platform_osx(
|
||||
diff -Naur Python-3.7.0-orig/Lib/tempfile.py Python-3.7.0/Lib/tempfile.py
|
||||
--- Python-3.7.0-orig/Lib/tempfile.py 2015-02-25 14:27:44.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/tempfile.py 2015-05-07 09:58:35.086000000 +0300
|
||||
@@ -557,7 +557,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/tempfile.py Python-3.8.2/Lib/tempfile.py
|
||||
--- Python-3.8.2-orig/Lib/tempfile.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/tempfile.py 2020-04-16 12:10:16.483289300 +0300
|
||||
@@ -549,7 +549,7 @@
|
||||
_os.close(fd)
|
||||
raise
|
||||
|
||||
-if _os.name != 'posix' or _os.sys.platform == 'cygwin':
|
||||
+if _os.name != 'posix' or _os.sys.platform == 'cygwin' or _os.sys.platform == 'msys':
|
||||
-if _os.name != 'posix' or _sys.platform == 'cygwin':
|
||||
+if _os.name != 'posix' or _sys.platform == 'cygwin' or _sys.platform == 'msys':
|
||||
# On non-POSIX and Cygwin systems, assume that we cannot unlink a file
|
||||
# while it is open.
|
||||
TemporaryFile = NamedTemporaryFile
|
||||
diff -Naur Python-3.7.0-orig/Lib/test/test_curses.py Python-3.7.0/Lib/test/test_curses.py
|
||||
--- Python-3.7.0-orig/Lib/test/test_curses.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/test/test_curses.py 2015-05-07 09:58:35.086000000 +0300
|
||||
@@ -40,6 +40,8 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_c_locale_coercion.py Python-3.8.2/Lib/test/test_c_locale_coercion.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_c_locale_coercion.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_c_locale_coercion.py 2020-04-16 12:27:51.690076700 +0300
|
||||
@@ -44,7 +44,7 @@
|
||||
elif sys.platform == "darwin":
|
||||
# FS encoding is UTF-8 on macOS
|
||||
EXPECTED_C_LOCALE_FS_ENCODING = "utf-8"
|
||||
-elif sys.platform == "cygwin":
|
||||
+elif sys.platform == "cygwin" or sys.platform == "msys":
|
||||
# Cygwin defaults to using C.UTF-8
|
||||
# TODO: Work out a robust dynamic test for this that doesn't rely on
|
||||
# CPython's own locale handling machinery
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_curses.py Python-3.8.2/Lib/test/test_curses.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_curses.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_curses.py 2020-04-16 11:24:20.700885900 +0300
|
||||
@@ -43,6 +43,8 @@
|
||||
"$TERM=%r, calling initscr() may cause exit" % term)
|
||||
@unittest.skipIf(sys.platform == "cygwin",
|
||||
"cygwin's curses mostly just hangs")
|
||||
@@ -377,10 +409,10 @@ diff -Naur Python-3.7.0-orig/Lib/test/test_curses.py Python-3.7.0/Lib/test/test_
|
||||
class TestCurses(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
diff -Naur Python-3.7.0-orig/Lib/test/test_importlib/util.py Python-3.7.0/Lib/test/test_importlib/util.py
|
||||
--- Python-3.7.0-orig/Lib/test/test_importlib/util.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/test/test_importlib/util.py 2015-05-07 09:58:35.086000000 +0300
|
||||
@@ -85,7 +85,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_importlib/util.py Python-3.8.2/Lib/test/test_importlib/util.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_importlib/util.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_importlib/util.py 2020-04-16 11:24:20.738756200 +0300
|
||||
@@ -92,7 +92,7 @@
|
||||
CASE_INSENSITIVE_FS = True
|
||||
# Windows is the only OS that is *always* case-insensitive
|
||||
# (OS X *can* be case-sensitive).
|
||||
@@ -389,9 +421,9 @@ diff -Naur Python-3.7.0-orig/Lib/test/test_importlib/util.py Python-3.7.0/Lib/te
|
||||
changed_name = __file__.upper()
|
||||
if changed_name == __file__:
|
||||
changed_name = __file__.lower()
|
||||
diff -Naur Python-3.7.0-orig/Lib/test/test_mailbox.py Python-3.7.0/Lib/test/test_mailbox.py
|
||||
--- Python-3.7.0-orig/Lib/test/test_mailbox.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/test/test_mailbox.py 2015-05-07 09:58:35.086000000 +0300
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_mailbox.py Python-3.8.2/Lib/test/test_mailbox.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_mailbox.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_mailbox.py 2020-04-16 11:24:20.774689700 +0300
|
||||
@@ -591,7 +591,7 @@
|
||||
|
||||
def setUp(self):
|
||||
@@ -401,22 +433,22 @@ diff -Naur Python-3.7.0-orig/Lib/test/test_mailbox.py Python-3.7.0/Lib/test/test
|
||||
self._box.colon = '!'
|
||||
|
||||
def assertMailboxEmpty(self):
|
||||
diff -Naur Python-3.7.0-orig/Lib/test/test_netrc.py Python-3.7.0/Lib/test/test_netrc.py
|
||||
--- Python-3.7.0-orig/Lib/test/test_netrc.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/test/test_netrc.py 2015-05-07 09:58:35.117200000 +0300
|
||||
@@ -8,7 +8,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_netrc.py Python-3.8.2/Lib/test/test_netrc.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_netrc.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_netrc.py 2020-04-16 11:24:20.794640700 +0300
|
||||
@@ -7,7 +7,7 @@
|
||||
def make_nrc(self, test_data):
|
||||
test_data = textwrap.dedent(test_data)
|
||||
mode = 'w'
|
||||
- if sys.platform != 'cygwin':
|
||||
+ if sys.platform not in ['cygwin', 'msys']:
|
||||
mode += 't'
|
||||
with open(temp_filename, mode) as fp:
|
||||
fp.write(test_data)
|
||||
diff -Naur Python-3.7.0-orig/Lib/test/test_shutil.py Python-3.7.0/Lib/test/test_shutil.py
|
||||
--- Python-3.7.0-orig/Lib/test/test_shutil.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/test/test_shutil.py 2015-05-07 09:58:35.117200000 +0300
|
||||
@@ -97,7 +97,7 @@
|
||||
temp_fd, temp_filename = tempfile.mkstemp()
|
||||
with os.fdopen(temp_fd, mode=mode) as fp:
|
||||
diff -Naur Python-3.8.2-orig/Lib/test/test_shutil.py Python-3.8.2/Lib/test/test_shutil.py
|
||||
--- Python-3.8.2-orig/Lib/test/test_shutil.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/test/test_shutil.py 2020-04-16 12:09:20.258481700 +0300
|
||||
@@ -169,7 +169,7 @@
|
||||
super(TestShutil, self).tearDown()
|
||||
while self.tempdirs:
|
||||
d = self.tempdirs.pop()
|
||||
@@ -425,30 +457,18 @@ diff -Naur Python-3.7.0-orig/Lib/test/test_shutil.py Python-3.7.0/Lib/test/test_
|
||||
|
||||
|
||||
def mkdtemp(self):
|
||||
@@ -196,7 +196,7 @@
|
||||
@@ -311,7 +311,7 @@
|
||||
self.assertIn(errors[1][2][1].filename, possible_args)
|
||||
|
||||
|
||||
@unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.chmod()')
|
||||
- @unittest.skipIf(sys.platform[:6] == 'cygwin',
|
||||
+ @unittest.skipIf(sys.platform[:6] == 'cygwin' or sys.platform[:4] == 'msys',
|
||||
"This test can't be run on Cygwin (issue #1071513).")
|
||||
@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
|
||||
"This test can't be run reliably as root (issue #1076467).")
|
||||
diff -Naur Python-3.7.0-orig/Lib/_pyio.py Python-3.7.0/Lib/_pyio.py
|
||||
--- Python-3.7.0-orig/Lib/_pyio.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/_pyio.py 2015-05-07 09:58:35.117200000 +0300
|
||||
@@ -10,7 +10,7 @@
|
||||
import sys
|
||||
# Import _thread instead of threading to reduce startup cost
|
||||
from _thread import allocate_lock as Lock
|
||||
-if sys.platform in {'win32', 'cygwin'}:
|
||||
+if sys.platform in {'win32', 'cygwin', 'msys'}:
|
||||
from msvcrt import setmode as _setmode
|
||||
else:
|
||||
_setmode = None
|
||||
diff -Naur Python-3.7.0-orig/Lib/tkinter/test/test_tkinter/test_loadtk.py Python-3.7.0/Lib/tkinter/test/test_tkinter/test_loadtk.py
|
||||
--- Python-3.7.0-orig/Lib/tkinter/test/test_tkinter/test_loadtk.py 2015-02-25 14:27:45.000000000 +0300
|
||||
+++ Python-3.7.0/Lib/tkinter/test/test_tkinter/test_loadtk.py 2015-05-07 09:58:35.117200000 +0300
|
||||
diff -Naur Python-3.8.2-orig/Lib/tkinter/test/test_tkinter/test_loadtk.py Python-3.8.2/Lib/tkinter/test/test_tkinter/test_loadtk.py
|
||||
--- Python-3.8.2-orig/Lib/tkinter/test/test_tkinter/test_loadtk.py 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Lib/tkinter/test/test_tkinter/test_loadtk.py 2020-04-16 11:24:20.906330300 +0300
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
def testLoadTkFailure(self):
|
||||
@@ -458,10 +478,10 @@ diff -Naur Python-3.7.0-orig/Lib/tkinter/test/test_tkinter/test_loadtk.py Python
|
||||
# no failure possible on windows?
|
||||
|
||||
# XXX Maybe on tk older than 8.4.13 it would be possible,
|
||||
diff -Naur Python-3.7.0-orig/Modules/makesetup Python-3.7.0/Modules/makesetup
|
||||
--- Python-3.7.0-orig/Modules/makesetup 2015-05-07 09:55:42.954400000 +0300
|
||||
+++ Python-3.7.0/Modules/makesetup 2015-05-07 09:58:35.132800000 +0300
|
||||
@@ -86,7 +86,7 @@
|
||||
diff -Naur Python-3.8.2-orig/Modules/makesetup Python-3.8.2/Modules/makesetup
|
||||
--- Python-3.8.2-orig/Modules/makesetup 2020-02-25 00:36:25.000000000 +0300
|
||||
+++ Python-3.8.2/Modules/makesetup 2020-04-16 11:24:20.926282900 +0300
|
||||
@@ -88,7 +88,7 @@
|
||||
# Setup to link with extra libraries when making shared extensions.
|
||||
# Currently, only Cygwin needs this baggage.
|
||||
case `uname -s` in
|
||||
@@ -470,47 +490,23 @@ diff -Naur Python-3.7.0-orig/Modules/makesetup Python-3.7.0/Modules/makesetup
|
||||
then
|
||||
ExtraLibDir=.
|
||||
else
|
||||
diff -Naur Python-3.7.0-orig/setup.py Python-3.7.0/setup.py
|
||||
--- Python-3.7.0-orig/setup.py 2015-05-07 09:55:33.329200000 +0300
|
||||
+++ Python-3.7.0/setup.py 2015-05-07 09:58:35.132800000 +0300
|
||||
@@ -361,7 +361,7 @@
|
||||
diff -Naur Python-3.8.2-orig/setup.py Python-3.8.2/setup.py
|
||||
--- Python-3.8.2-orig/setup.py 2020-04-16 11:05:53.028879500 +0300
|
||||
+++ Python-3.8.2/setup.py 2020-04-16 12:07:07.164536800 +0300
|
||||
@@ -42,6 +42,7 @@
|
||||
HOST_PLATFORM = get_platform()
|
||||
MS_WINDOWS = (HOST_PLATFORM == 'win32')
|
||||
CYGWIN = (HOST_PLATFORM == 'cygwin')
|
||||
+MSYS = (HOST_PLATFORM == 'msys')
|
||||
MACOS = (HOST_PLATFORM == 'darwin')
|
||||
AIX = (HOST_PLATFORM.startswith('aix'))
|
||||
VXWORKS = ('vxworks' in HOST_PLATFORM)
|
||||
@@ -505,7 +506,7 @@
|
||||
|
||||
# Workaround for Cygwin: Cygwin currently has fork issues when many
|
||||
# modules have been imported
|
||||
- if host_platform == 'cygwin':
|
||||
+ if host_platform in ['cygwin', 'msys']:
|
||||
- if CYGWIN:
|
||||
+ if CYGWIN or MSYS:
|
||||
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
|
||||
% ext.name)
|
||||
return
|
||||
@@ -1577,6 +1577,10 @@
|
||||
macros = dict()
|
||||
libraries = []
|
||||
|
||||
+ elif host_platform == 'msys': # MSYS
|
||||
+ macros = dict()
|
||||
+ libraries = []
|
||||
+
|
||||
elif host_platform.startswith('openbsd'):
|
||||
macros = dict()
|
||||
libraries = []
|
||||
@@ -2223,7 +2223,7 @@
|
||||
return ext
|
||||
|
||||
def _detect_nis(self, inc_dirs, lib_dirs):
|
||||
- if host_platform in {'win32', 'cygwin', 'qnx6'}:
|
||||
+ if host_platform in {'win32', 'cygwin', 'msys', 'qnx6'}:
|
||||
return None
|
||||
|
||||
libs = []
|
||||
diff -aur Python-3.6.0/Lib/test/test_asyncio/test_base_events.py.orig Python-3.6.0/Lib/test/test_asyncio/test_base_events.py
|
||||
--- Python-3.6.0/Lib/test/test_asyncio/test_base_events.py.orig 2017-02-08 15:03:29.184676300 -0500
|
||||
+++ Python-3.6.0/Lib/test/test_asyncio/test_base_events.py 2017-02-08 15:49:05.932013200 -0500
|
||||
@@ -1576,7 +1576,7 @@
|
||||
sock = transport.get_extra_info('socket')
|
||||
|
||||
reuse_address_default_on = (
|
||||
- os.name == 'posix' and sys.platform != 'cygwin')
|
||||
+ os.name == 'posix' and sys.platform != 'cygwin' and sys.platform != 'msys')
|
||||
reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
|
||||
|
||||
if reuse_address_default_on:
|
||||
|
||||
Reference in New Issue
Block a user