diff --git a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index 9036723090..4a5d31b085 100644 --- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From 10dfe80078d9a80e26715a8cefa37af3bb2af335 Mon Sep 17 00:00:00 2001 +From 8a5233378f8e907e64e86930e182da7f02347cfc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index 2e1ed98d02..baadc610c5 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From f7d2921eac5dc47b9905f6890fb1a1eafbb6d4ff Mon Sep 17 00:00:00 2001 +From 3fe86ae652c515f12abead07dad8e24592bffa78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -56,10 +56,10 @@ index 0000000..5c1299d +# based on configure-time options. + diff --git a/configure.ac b/configure.ac -index 431d661..471860c 100644 +index 1354cc0..bf51f19 100644 --- a/configure.ac +++ b/configure.ac -@@ -5856,7 +5856,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") +@@ -5855,7 +5855,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") ]) # generate output files @@ -68,7 +68,7 @@ index 431d661..471860c 100644 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) AC_OUTPUT -@@ -5868,7 +5868,7 @@ fi +@@ -5867,7 +5867,7 @@ fi echo "creating Makefile" >&AS_MESSAGE_FD $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ diff --git a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index c354e00748..75ca2891aa 100644 --- a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,4 +1,4 @@ -From 6e5dbed1e20ccb472c1636b22580d716c3692da3 Mon Sep 17 00:00:00 2001 +From 1cec80cfc0e957cb13608449edb13e7d11bf5ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -78,7 +78,7 @@ index fe78135..344b76e 100644 # include /* O_CREAT and O_EXCL */ # if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED) diff --git a/configure.ac b/configure.ac -index 471860c..6a375e3 100644 +index bf51f19..d104ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,53 @@ then @@ -166,7 +166,7 @@ index 471860c..6a375e3 100644 utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ -@@ -2232,6 +2285,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) +@@ -2232,6 +2285,14 @@ sys/endian.h sys/sysmacros.h linux/auxvec.h linux/memfd.h linux/wait.h sys/memfd AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -244,7 +244,7 @@ index 471860c..6a375e3 100644 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ faccessat fchmod fchmodat fchown fchownat \ -@@ -4625,6 +4710,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) +@@ -4624,6 +4709,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) # the kernel module that provides POSIX semaphores # isn't loaded by default, so an attempt to call # sem_open results in a 'Signal 12' error. @@ -255,7 +255,7 @@ index 471860c..6a375e3 100644 AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4658,6 +4747,14 @@ fi +@@ -4657,6 +4746,14 @@ fi # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -271,10 +271,10 @@ index 471860c..6a375e3 100644 AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include diff --git a/pyconfig.h.in b/pyconfig.h.in -index 188faee..1df9659 100644 +index ce850fc..ef8fe0d 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in -@@ -1365,6 +1365,9 @@ +@@ -1368,6 +1368,9 @@ /* Define if mvwdelch in curses.h is an expression. */ #undef MVWDELCH_IS_EXPRESSION diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 9c7ee81a55..87b9e56aeb 100644 --- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,4 +1,4 @@ -From 543163880ae967bc44e338c6dc0b04c94a8e5add Mon Sep 17 00:00:00 2001 +From 7647cca58c3a17b1f182dc5b91f516ab1cacce4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:13 +0530 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index 2ffd1a9bb1..6fba3d95dd 100644 --- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,4 +1,4 @@ -From 98ab3e71389dc707d622f1b1906ab6f408c6022b Mon Sep 17 00:00:00 2001 +From e1a0fbc5d1ec37d323a94ea40c08643938b59291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:14 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac -index 6a375e3..eb285cc 100644 +index d104ea7..bc04e7c 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,9 @@ then diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 17ec0817c8..319389c689 100644 --- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch @@ -1,4 +1,4 @@ -From 593c0be91e0ab8fc52245f52c48ef6b4e388b1a7 Mon Sep 17 00:00:00 2001 +From 80a945c3da93d0cec1a21cffce5ffbea6899abd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:15 +0530 @@ -53,7 +53,7 @@ index 0000000..03fde9e + +ac_cv_have_size_t_format=no diff --git a/configure.ac b/configure.ac -index eb285cc..bbea587 100644 +index bc04e7c..a3eb756 100644 --- a/configure.ac +++ b/configure.ac @@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index f249ab7088..f6999f7074 100644 --- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,4 +1,4 @@ -From 0c221d4dc9d63ea30e7a4fb28cbdd31af3c03ee7 Mon Sep 17 00:00:00 2001 +From ada174fe8a8688db117c61d50b64f9e313395a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:16 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index bbea587..ea7d551 100644 +index a3eb756..14115da 100644 --- a/configure.ac +++ b/configure.ac @@ -2494,8 +2494,20 @@ AC_CHECK_SIZEOF(off_t, [], [ diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 572bc9320d..92066e11c0 100644 --- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From bb3504f70b2ae039c32da6405a11b82b79dbfefe Mon Sep 17 00:00:00 2001 +From 69badeab6da91c9869e26e835bb3596ec5a843e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:18 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index ea7d551..bb80ed8 100644 +index 14115da..03daa74 100644 --- a/configure.ac +++ b/configure.ac -@@ -5654,8 +5654,21 @@ do +@@ -5653,8 +5653,21 @@ do THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 707b5816f1..fed058bff7 100644 --- a/mingw-w64-python/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch @@ -1,4 +1,4 @@ -From 9968428f3157658c0b47ce4f7732c82bf4a10406 Mon Sep 17 00:00:00 2001 +From d567784ad2c59b6fe15bababf0a077dfc9403eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -101,7 +101,7 @@ index 29d6126..3894e35 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index bb80ed8..d3ee3fe 100644 +index 03daa74..d2e3156 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,14 @@ then diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 45d8cae823..5ebcb01a22 100644 --- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch @@ -1,4 +1,4 @@ -From 4061aa3b0c5530615a37774fc78aa485b88ab2cd Mon Sep 17 00:00:00 2001 +From 04c94c11e51f541660a7e27038cfa0f2e9dfea5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:20 +0530 @@ -57,7 +57,7 @@ index fd1ccb7..b6f1a8f 100644 static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); diff --git a/configure.ac b/configure.ac -index d3ee3fe..fcbb02c 100644 +index d2e3156..13d9e54 100644 --- a/configure.ac +++ b/configure.ac @@ -3338,6 +3338,13 @@ else diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index 7bfd817c36..d9a671d062 100644 --- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,4 +1,4 @@ -From 5687d0c4fd9b15b0ac3c8ce0ebd35e824a3f0475 Mon Sep 17 00:00:00 2001 +From d5d2c27f8b6ace60b46703a02e911a14e24fc4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -43,7 +43,7 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index fcbb02c..b797c58 100644 +index 13d9e54..e49ceef 100644 --- a/configure.ac +++ b/configure.ac @@ -3345,6 +3345,13 @@ case $host in diff --git a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index 6ed227d0ac..e4b2171309 100644 --- a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,4 +1,4 @@ -From 85ff42f6dea113f58dfbc588eec2ee3174c17793 Mon Sep 17 00:00:00 2001 +From a6032de74f6216e4fe2c3ddc33c54473779c976e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:23 +0530 @@ -64,7 +64,7 @@ index 475c2a8..a05fa3a 100644 /* module init functions outside the core must be exported */ # if defined(__cplusplus) diff --git a/setup.py b/setup.py -index c6023e1..86f877b 100644 +index 0bec170..69f8e19 100644 --- a/setup.py +++ b/setup.py @@ -450,6 +450,9 @@ class PyBuildExt(build_ext): diff --git a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index 7626e1d976..848521c6a6 100644 --- a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch @@ -1,4 +1,4 @@ -From a987eaf37f68be6e22fdca2cbc67e6df1eb14611 Mon Sep 17 00:00:00 2001 +From b4e580bb50341e3b195137dd0a0a7b4bb4868eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:24 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b797c58..b457a4b 100644 +index e49ceef..a6ce410 100644 --- a/configure.ac +++ b/configure.ac @@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then @@ -54,7 +54,7 @@ index b797c58..b457a4b 100644 fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -5682,7 +5699,8 @@ case $host in +@@ -5681,7 +5698,8 @@ case $host in dnl "errmap.h" from $srcdir/PC. dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h dnl has to be before customized located in ../PC. diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index 5731633a5b..68d9ae8f39 100644 --- a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch @@ -1,4 +1,4 @@ -From 0aca06809a58f19465df1f1245e0383da9129835 Mon Sep 17 00:00:00 2001 +From 9bb26cb974bacee73e05ab95bf4f680dc10995b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:25 +0530 @@ -59,7 +59,7 @@ index 81787e5..9d7690e 100644 /* restore old error mode settings */ diff --git a/configure.ac b/configure.ac -index b457a4b..6ba6dc7 100644 +index a6ce410..9f18619 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,9 @@ if test -z "$SHLIB_SUFFIX"; then @@ -86,7 +86,7 @@ index b457a4b..6ba6dc7 100644 fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -5679,6 +5689,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5678,6 +5688,12 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index a95d86f050..de2ce57960 100644 --- a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,4 +1,4 @@ -From 4d8528bd2de264a45cbcd0f2b7ac86ffa57da6d1 Mon Sep 17 00:00:00 2001 +From 4cdc6c68bbb9882e579e33f73de79cfec3d4e0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -27,10 +27,10 @@ index 3b96788..1c46d07 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index 6ba6dc7..ac5061f 100644 +index 9f18619..7c9338a 100644 --- a/configure.ac +++ b/configure.ac -@@ -5720,6 +5720,16 @@ case $host in +@@ -5719,6 +5719,16 @@ case $host in ;; esac diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 642f3443ff..1e830cd849 100644 --- a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch @@ -1,4 +1,4 @@ -From 63926d1e82cfdac69ee3fedced546db4fafb44ed Mon Sep 17 00:00:00 2001 +From 2c55fbc4a84f64f04bb6644c0d30d9fecaa69d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index 86f877b..f00612a 100644 +index 69f8e19..ce72884 100644 --- a/setup.py +++ b/setup.py -@@ -1771,7 +1771,12 @@ class PyBuildExt(build_ext): +@@ -1773,7 +1773,12 @@ class PyBuildExt(build_ext): libraries=libs, include_dirs=["Modules/_multiprocessing"])) diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index dfb3f7c717..8d65ce89d8 100644 --- a/mingw-w64-python/0017-MINGW-setup-select-module.patch +++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch @@ -1,4 +1,4 @@ -From 214eb1d0c11cb7ac5070765c099fcbb6eb930f1f Mon Sep 17 00:00:00 2001 +From dcecaf981e98163e94030b649cfacaf53adc73a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:29 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Алексей 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index fb71e91..ad3990c 100644 +index d4af4f7..073c2ff 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -155,9 +155,9 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) @@ -39,10 +39,10 @@ index fb71e91..ad3990c 100644 /* add object and its file descriptor to the list */ diff --git a/setup.py b/setup.py -index f00612a..d74f25e 100644 +index ce72884..2142b7e 100644 --- a/setup.py +++ b/setup.py -@@ -909,7 +909,11 @@ class PyBuildExt(build_ext): +@@ -911,7 +911,11 @@ class PyBuildExt(build_ext): self.missing.append('spwd') # select(2); not on ancient System V diff --git a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index 59bf94f3a5..3111ef279d 100644 --- a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,4 +1,4 @@ -From 9b7ef57e2a6bc784555d9671ed7b1101fe03f7fa Mon Sep 17 00:00:00 2001 +From b1cf47517080dddbbb8de3701b07c1c1507ec923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d74f25e..2c3e29e 100644 +index 2142b7e..52d25e6 100644 --- a/setup.py +++ b/setup.py -@@ -2156,9 +2156,12 @@ class PyBuildExt(build_ext): +@@ -2158,9 +2158,12 @@ class PyBuildExt(build_ext): self.add(ext) if TEST_EXTENSIONS: # function my_sqrt() needs libm for sqrt() @@ -31,7 +31,7 @@ index d74f25e..2c3e29e 100644 ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR") ffi_lib = None -@@ -2203,6 +2206,8 @@ class PyBuildExt(build_ext): +@@ -2205,6 +2208,8 @@ class PyBuildExt(build_ext): ext.include_dirs.append(ffi_inc) ext.libraries.append(ffi_lib) diff --git a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index 81eb6758f2..9fcc78a5d9 100644 --- a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,4 +1,4 @@ -From 9c06f597151aafa16ed53c8d434ce60a21ca676b Mon Sep 17 00:00:00 2001 +From 62d61783b6af56c5497a042e3b6151d4968d26b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -61,7 +61,7 @@ index a22060d..be91ad0 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index ac5061f..495cf68 100644 +index 7c9338a..29ea2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -4455,21 +4455,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -105,7 +105,7 @@ index ac5061f..495cf68 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -5610,7 +5625,10 @@ fi +@@ -5609,7 +5624,10 @@ fi AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -118,7 +118,7 @@ index ac5061f..495cf68 100644 #include #endif diff --git a/pyconfig.h.in b/pyconfig.h.in -index 1df9659..10255f6 100644 +index ef8fe0d..25fa98a 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -54,7 +54,7 @@ @@ -130,7 +130,7 @@ index 1df9659..10255f6 100644 #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ -@@ -1348,6 +1348,9 @@ +@@ -1351,6 +1351,9 @@ /* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST @@ -140,7 +140,7 @@ index 1df9659..10255f6 100644 /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY -@@ -1664,7 +1667,7 @@ +@@ -1662,7 +1665,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t @@ -150,10 +150,10 @@ index 1df9659..10255f6 100644 /* Define to `int' if doesn't define. */ diff --git a/setup.py b/setup.py -index 2c3e29e..2beb525 100644 +index 52d25e6..3b5f4a5 100644 --- a/setup.py +++ b/setup.py -@@ -1146,6 +1146,8 @@ class PyBuildExt(build_ext): +@@ -1148,6 +1148,8 @@ class PyBuildExt(build_ext): if MACOS: # Issue #35569: Expose RFC 3542 socket options. kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542'] diff --git a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index 2cefa194d3..bca5274080 100644 --- a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch @@ -1,4 +1,4 @@ -From 8935c150ff336f6ba87ab67cb0b134586c26b694 Mon Sep 17 00:00:00 2001 +From 875da9783c7cf0ae21911d3160f256337e0fe197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:31 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py -index 2beb525..a35f493 100644 +index 3b5f4a5..cb2fbbe 100644 --- a/setup.py +++ b/setup.py -@@ -892,13 +892,21 @@ class PyBuildExt(build_ext): +@@ -894,13 +894,21 @@ class PyBuildExt(build_ext): if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)): # May be necessary on AIX for flock function libs = ['bsd'] @@ -42,7 +42,7 @@ index 2beb525..a35f493 100644 # spwd, shadow passwords if (self.config_h_vars.get('HAVE_GETSPNAM', False) or self.config_h_vars.get('HAVE_GETSPENT', False)): -@@ -923,7 +931,10 @@ class PyBuildExt(build_ext): +@@ -925,7 +933,10 @@ class PyBuildExt(build_ext): # Lance Ellinghaus's syslog module # syslog daemon interface @@ -54,7 +54,7 @@ index 2beb525..a35f493 100644 # Python interface to subinterpreter C-API. self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c'])) -@@ -949,7 +960,10 @@ class PyBuildExt(build_ext): +@@ -951,7 +962,10 @@ class PyBuildExt(build_ext): self.add(Extension('_csv', ['_csv.c'])) # POSIX subprocess module helper. @@ -66,7 +66,7 @@ index 2beb525..a35f493 100644 def detect_test_extensions(self): # Python C API test module -@@ -1131,13 +1145,16 @@ class PyBuildExt(build_ext): +@@ -1133,13 +1147,16 @@ class PyBuildExt(build_ext): # the encryption. return diff --git a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index b899e6e003..b975eb1b1b 100644 --- a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,4 +1,4 @@ -From 21c092964fa1524ea3e5a30995924a87d4af9fac Mon Sep 17 00:00:00 2001 +From ea1e6b37c4dba7fbf0ba747f758cc729449b88b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:33 +0530 @@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644 #endif diff --git a/setup.py b/setup.py -index a35f493..a802e51 100644 +index cb2fbbe..7875daf 100644 --- a/setup.py +++ b/setup.py -@@ -1607,6 +1607,27 @@ class PyBuildExt(build_ext): +@@ -1609,6 +1609,27 @@ class PyBuildExt(build_ext): '-framework', 'SystemConfiguration', '-framework', 'CoreFoundation'])) diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch index 76d7fdd5a1..7ed2b12039 100644 --- a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From 27c14e48f60c152b2dfb6031b21f26b9c79c93bb Mon Sep 17 00:00:00 2001 +From 47abd886a795668d88c9a9bd4c049173a305f913 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index 3df24899c6..741d6c36eb 100644 --- a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch @@ -1,4 +1,4 @@ -From ba662c4c0f3a9fc5ee296fb4a6b5c5038bc1ae79 Mon Sep 17 00:00:00 2001 +From 5c726a88e4aefde5ca07fbb5ef93d3ae752e31f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:37 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index a802e51..2e2578c 100644 +index 7875daf..c6ee784 100644 --- a/setup.py +++ b/setup.py -@@ -2388,6 +2388,8 @@ class PyBuildExt(build_ext): +@@ -2390,6 +2390,8 @@ class PyBuildExt(build_ext): openssl_includes = split_var('OPENSSL_INCLUDES', '-I') openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L') openssl_libs = split_var('OPENSSL_LIBS', '-l') diff --git a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 8a36203212..3a7d208a8b 100644 --- a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,4 +1,4 @@ -From 6b724ccae0bdef5fc26ccd45a46fbfe466c6940b Mon Sep 17 00:00:00 2001 +From 8969ca205e0a2546efdb9ca5f32552f8615236f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:38 +0530 diff --git a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index 1f8a02404f..ccc85bc79d 100644 --- a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From 1b5307c71e0c90bc47a19b799c702619631b8b40 Mon Sep 17 00:00:00 2001 +From 3173cb2fb401aaefea7a38cacc9603d95f8497dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:39 +0530 diff --git a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index 68f8ebd0da..0ea3753ce2 100644 --- a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,4 +1,4 @@ -From 7e4c459c2f2ce9031239e94cc141ff7aacc10c26 Mon Sep 17 00:00:00 2001 +From 89d2cef716fa55d1f5fddfce7b837d179bb92193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 2e2578c..0d2740b 100644 +index c6ee784..05f0bdf 100644 --- a/setup.py +++ b/setup.py -@@ -2609,7 +2609,7 @@ class PyBuildScripts(build_scripts): +@@ -2611,7 +2611,7 @@ class PyBuildScripts(build_scripts): else: newfilename = filename + minoronly log.info('renaming %s to %s', filename, newfilename) diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index e56a8cd338..12ca3f2451 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 63cf4844b28e2353500735dc156ef64fe46956bd Mon Sep 17 00:00:00 2001 +From 5f7f38637b00b6ab1dc0771b590fd82d42b580c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:42 +0530 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index 4b1a75eae7..c7f9a153d6 100644 --- a/mingw-w64-python/0028-add-python-config-sh.patch +++ b/mingw-w64-python/0028-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From 3070c3206e021b6427ab4483be27afbb10a959c1 Mon Sep 17 00:00:00 2001 +From cfa41f76e59f435cde19a096468b58735d726f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 69d403f666..3d9f71545b 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From 967b2ec36000c3250b99d190420064cb8f55d8a0 Mon Sep 17 00:00:00 2001 +From fc8a0f0ce53d73cd3f1530ee967a2e33edbf377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:44 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 495cf68..7f2bb28 100644 +index 29ea2e2..56ec5d5 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ if test -z "$MACHDEP" diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index 8f5eb9a13c..595823bf95 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From 8153173167969474e8f6d593e9a29673075fcc38 Mon Sep 17 00:00:00 2001 +From 9d11dfe47922120125bf3512c1a10407dd6a85c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:45 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index 0d2740b..d6b0856 100644 +index 05f0bdf..8453b28 100644 --- a/setup.py +++ b/setup.py -@@ -2248,6 +2248,8 @@ class PyBuildExt(build_ext): +@@ -2250,6 +2250,8 @@ class PyBuildExt(build_ext): ext.libraries.append(ffi_lib) if MS_WINDOWS: ext.libraries.extend(['ole32', 'oleaut32', 'uuid']) diff --git a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 0279a49447..3bbf0e3217 100644 --- a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,4 +1,4 @@ -From 4d5064d190e3c44030ebad8e66966f9b1b4714bf Mon Sep 17 00:00:00 2001 +From 4b4a9f3978055f511ee83e6603f035598d178753 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index 73ebe8c4bf..f08dc69491 100644 --- a/mingw-w64-python/0032-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch @@ -1,4 +1,4 @@ -From c743ec5883ee146dde9259c54730bd48810c316c Mon Sep 17 00:00:00 2001 +From 59c58ec1201b8933acdfe13b0540b96901ebaf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:47 +0530 diff --git a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index cfa6a854ce..89cd654960 100644 --- a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,4 +1,4 @@ -From ef90ac0fa4d305d9fa76ead9755ab7a731cd0f8c Mon Sep 17 00:00:00 2001 +From 0ca1a9ac95b32ebf2eb2fd6953d23b3254061b21 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH diff --git a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index 04b6ea1143..a22efda8e8 100644 --- a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,4 +1,4 @@ -From 970c6cc2d5fcb3b09f2735da2606e6a24bd7d505 Mon Sep 17 00:00:00 2001 +From 54ed5c7fd76229bf8ccd5f26d617be8b807fa89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:49 +0530 diff --git a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index b47a670b22..0edd68a535 100644 --- a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From 73afad716d68e9fb11b05e2c0cbf27c66279934a Mon Sep 17 00:00:00 2001 +From 0fdfb849f5a5a9c810a29e87dcae7ac070c91237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:50 +0530 @@ -52,7 +52,7 @@ index 1c46d07..3d42756 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index 7f2bb28..a7d664c 100644 +index 56ec5d5..1c65cb9 100644 --- a/configure.ac +++ b/configure.ac @@ -618,6 +618,65 @@ then diff --git a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index 26915f2c59..9efe627f65 100644 --- a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From d838915f88ce43b34f41387829b86b7c0c982a44 Mon Sep 17 00:00:00 2001 +From 1a2fa359113c56d7394f6be60d8f03a4ce71c9cb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch index 0d4fb76f42..d040d94154 100644 --- a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch +++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch @@ -1,4 +1,4 @@ -From 57a08f6618707d6eec15884e12905a035edbd39a Mon Sep 17 00:00:00 2001 +From 79d0d1fa9aaa141f358e28e4702e4011a3ce4417 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:13:57 +0200 Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils @@ -20,10 +20,10 @@ index 825ce5d..b4e7ff7 100644 +@USE_WIN32_MODULE@_winapi _winapi.c diff --git a/setup.py b/setup.py -index d6b0856..27f7bb2 100644 +index 8453b28..eb90e21 100644 --- a/setup.py +++ b/setup.py -@@ -1615,7 +1615,9 @@ class PyBuildExt(build_ext): +@@ -1617,7 +1617,9 @@ class PyBuildExt(build_ext): self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p) for p in ['msvcrtmodule.c']])) diff --git a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index 4eeedb359d..4f59e73817 100644 --- a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 94bc3a2e5f1ff3b339127ba2d6f9df68c37b1eb1 Mon Sep 17 00:00:00 2001 +From a133212c3e8db78d1e883982ef1069b8d6a2076a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 27f7bb2..5164bf7 100644 +index eb90e21..7d6ad97 100644 --- a/setup.py +++ b/setup.py -@@ -740,10 +740,10 @@ class PyBuildExt(build_ext): +@@ -742,10 +742,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') diff --git a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index fccca3b785..ac4242b5a8 100644 --- a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From dacfd8590ddca1e85a5b8da81fe5074c7fcea5b2 Mon Sep 17 00:00:00 2001 +From 677dbd99749de9462640475d40c836c845b8ccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch index ef9ba78d95..40a62054e7 100644 --- a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 8a92dacab78e822097ba9064a104c81ac1baec29 Mon Sep 17 00:00:00 2001 +From e12f50d118c834253761902334042ed87b210266 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/N] msys convert_path fix and root hack diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index c61100107c..159b1bb2ef 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 31ffe9b84ec3c7b5a09f637ca94441d501bab380 Mon Sep 17 00:00:00 2001 +From 83136e79be5c629d9e429ef535fc189b058b6ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:54 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py -index 5164bf7..f761245 100644 +index 7d6ad97..dfa9e45 100644 --- a/setup.py +++ b/setup.py -@@ -789,7 +789,7 @@ class PyBuildExt(build_ext): +@@ -791,7 +791,7 @@ class PyBuildExt(build_ext): if HOST_PLATFORM == 'hp-ux11': self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -25,7 +25,7 @@ index 5164bf7..f761245 100644 # This should work on any unixy platform ;-) # If the user has bothered specifying additional -I and -L flags # in OPT and LDFLAGS we might as well use them here. -@@ -799,6 +799,8 @@ class PyBuildExt(build_ext): +@@ -801,6 +801,8 @@ class PyBuildExt(build_ext): # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -34,7 +34,7 @@ index 5164bf7..f761245 100644 for item in cflags.split(): if item.startswith('-I'): self.inc_dirs.append(item[2:]) -@@ -2049,14 +2051,19 @@ class PyBuildExt(build_ext): +@@ -2051,14 +2053,19 @@ class PyBuildExt(build_ext): # The versions with dots are used on Unix, and the versions without # dots on Windows, for detection by cygwin. tcllib = tklib = tcl_includes = tk_includes = None @@ -62,7 +62,7 @@ index 5164bf7..f761245 100644 break # Now check for the header files -@@ -2127,10 +2134,18 @@ class PyBuildExt(build_ext): +@@ -2129,10 +2136,18 @@ class PyBuildExt(build_ext): # Add the Tcl/Tk libraries libs.append('tk'+ version) libs.append('tcl'+ version) diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index 40aaec3604..3f77fbefde 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 6c38cd961b5f26566fcda0149a0b5f56314891ac Mon Sep 17 00:00:00 2001 +From 45f11028ee50e2c119b4e01a1a33363cd2c3d011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 diff --git a/mingw-w64-python/0043-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch index 59c3152c24..76370f5cfb 100644 --- a/mingw-w64-python/0043-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -1,4 +1,4 @@ -From 7161562c97559e655f41eb22c64cbcde2b964c3c Mon Sep 17 00:00:00 2001 +From ece61df7f04d99b3ecc583d104cffc1dad208335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:56 +0530 diff --git a/mingw-w64-python/0044-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch index b733884e4a..83438914bc 100644 --- a/mingw-w64-python/0044-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -1,4 +1,4 @@ -From 9aaf5d454559ff3ae731a84bcda8c6e2fd1f5161 Mon Sep 17 00:00:00 2001 +From 8a1ab51915a1206a7af777e841b13af99e7deca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 diff --git a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index e8cfb6685e..3a57fb4643 100644 --- a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From dd99397c2c183cc1ba25ca094458be36cedcef20 Mon Sep 17 00:00:00 2001 +From 5776888c0b214d7d15551b0fd6fc8822ad5f72b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index f761245..8454b28 100644 +index dfa9e45..6d282c8 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,17 @@ def get_platform(): diff --git a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index ec1bb278e0..bb09f34406 100644 --- a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 6ddd49f455c6312999c2ddc4340e44b59f892915 Mon Sep 17 00:00:00 2001 +From 4ba6a1542ffafc24de7e339e8d719876d0cf1314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:58 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py -index 8454b28..d4778b0 100644 +index 6d282c8..1610011 100644 --- a/setup.py +++ b/setup.py @@ -650,7 +650,7 @@ class PyBuildExt(build_ext): @@ -43,8 +43,8 @@ index 8454b28..d4778b0 100644 + tmpfile = os.path.join(self.build_temp, 'ccpaths').replace('\\','/') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) - ret = run_command('%s -E -v - %s 1>/dev/null' % (CC, tmpfile)) -@@ -1007,7 +1007,7 @@ class PyBuildExt(build_ext): + # bpo-38472: With a German locale, GCC returns "gcc-Version 9.1.0 +@@ -1009,7 +1009,7 @@ class PyBuildExt(build_ext): readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -53,7 +53,7 @@ index 8454b28..d4778b0 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -2005,12 +2005,12 @@ class PyBuildExt(build_ext): +@@ -2007,12 +2007,12 @@ class PyBuildExt(build_ext): cflags = sysconfig.get_config_vars('CFLAGS')[0] archs = re.findall(r'-arch\s+(\w+)', cflags) diff --git a/mingw-w64-python/0047-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch index 68da6c1d17..47ff3c1bb1 100644 --- a/mingw-w64-python/0047-remove_path_max.default.patch +++ b/mingw-w64-python/0047-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 208a623ac4e8cb7b3aee59425146ffb365fd4db6 Mon Sep 17 00:00:00 2001 +From 673e0e2f32d326c834747acc5799e0971190a0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0048-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch index 5d5005aaa1..ae939aec2b 100644 --- a/mingw-w64-python/0048-dont-link-with-gettext.patch +++ b/mingw-w64-python/0048-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From eee9aaf856e742f7cac350f3d6a2c0a50d84ee72 Mon Sep 17 00:00:00 2001 +From d2803ce7a81a8e37313eb128c3a1736c6bc62a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:00 +0530 @@ -32,7 +32,7 @@ index 2e353bb..ea222af 100644 #include #include diff --git a/configure.ac b/configure.ac -index a7d664c..7589b6a 100644 +index 1c65cb9..6408409 100644 --- a/configure.ac +++ b/configure.ac @@ -3166,10 +3166,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) diff --git a/mingw-w64-python/0049-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch index 0df73c7d1a..1bc49fa776 100644 --- a/mingw-w64-python/0049-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From b8b76d0c3fbc1c7e2bba5f96b74004b01ab80e28 Mon Sep 17 00:00:00 2001 +From 81f48b3ea54d0aa07a184c59054a1b322a8cfbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:01 +0530 diff --git a/mingw-w64-python/0050-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch index 9c12c8caa4..2b07e3b3e9 100644 --- a/mingw-w64-python/0050-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 149095ab008febab268fb6c856993a83ccd08eb3 Mon Sep 17 00:00:00 2001 +From 7cb3d01d22817126766f6abd05ec068bfc8f10d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 diff --git a/mingw-w64-python/0051-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch index 2caf9d3ea5..7dbc6ab84e 100644 --- a/mingw-w64-python/0051-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 0f1bebcc7b043d9273ac3870531a59fd8859326d Mon Sep 17 00:00:00 2001 +From 8acf8c67bba722b67a000168e75e45d880acf8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:03 +0530 diff --git a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index e0b1a20304..db56f606ac 100644 --- a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From b29e861982970d42e382108b4b16c8cf25d32285 Mon Sep 17 00:00:00 2001 +From bc632a522aa162d77abf4f7daabe044b94ff969b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates diff --git a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index f4f910f5ff..ba41c4aaa3 100644 --- a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From cb37925d62b9d617d83cc6cba9480964c10103b0 Mon Sep 17 00:00:00 2001 +From a0468ba01a418db7ee83c12fae6eff60599a2498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 diff --git a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index b2779f9851..6d5e93832b 100644 --- a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 3dbbdd2957d1209d531468bdeb6846ea769d5a14 Mon Sep 17 00:00:00 2001 +From 6be1bee38cff2538e6fa6e36d6deb7637091ab8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 diff --git a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch index 7349b854b1..b19d39dbc5 100644 --- a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From 19a6447da32b6e49268e27485804087170ab21fd Mon Sep 17 00:00:00 2001 +From fb0ec5b49cf7e6e4748ff40e47c1b96d10ec6e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:08 +0530 @@ -9,10 +9,10 @@ Subject: [PATCH 055/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 7589b6a..d97844f 100644 +index 6408409..e3dfab7 100644 --- a/configure.ac +++ b/configure.ac -@@ -5873,6 +5873,15 @@ for dir in $SRCDIRS; do +@@ -5872,6 +5872,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT(done) diff --git a/mingw-w64-python/0056-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch index c7da7bb914..178f70ce99 100644 --- a/mingw-w64-python/0056-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -1,4 +1,4 @@ -From eeee8f68e2eb0c50e61df4a7a3d9738a65faccc3 Mon Sep 17 00:00:00 2001 +From 094f2a91ae5e0e0dbb8e4dddcabc95655aa7a1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 Subject: [PATCH 056/N] install msilib diff --git a/mingw-w64-python/0057-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch index 5c8a665fd0..dbc61ccbc5 100644 --- a/mingw-w64-python/0057-fix-signal-module-build.patch +++ b/mingw-w64-python/0057-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From cbea8b321ec418a401189e0b92f54e63e6570be7 Mon Sep 17 00:00:00 2001 +From 7587891b261733efcb30bc7602340abf3c07aca5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 057/N] fix signal module build diff --git a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 0f488390de..3e2158f82c 100644 --- a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From e1f2b80e5f06d3486f68af91df064b743ddd41e5 Mon Sep 17 00:00:00 2001 +From 79f28ef15e76415698c0fa1eb036c8741902b081 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 058/N] build: build winconsoleio and _testconsole @@ -26,10 +26,10 @@ index 7ce4355..6bb5e51 100644 # faulthandler module faulthandler faulthandler.c diff --git a/setup.py b/setup.py -index d4778b0..6f4730d 100644 +index 1610011..8e1a822 100644 --- a/setup.py +++ b/setup.py -@@ -1001,6 +1001,9 @@ class PyBuildExt(build_ext): +@@ -1003,6 +1003,9 @@ class PyBuildExt(build_ext): ['_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c'])) diff --git a/mingw-w64-python/0059-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch index 2cdaac87b0..5e98f4d824 100644 --- a/mingw-w64-python/0059-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From 99ec2bf99c71fc9b81d241ead84c7044624053f2 Mon Sep 17 00:00:00 2001 +From d6bd58a05f5cc14d3dd898f7dc1beed36e91efaa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 059/N] expose sem_unlink diff --git a/mingw-w64-python/0060-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch index 633db9641a..c6b839e03b 100644 --- a/mingw-w64-python/0060-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 8a9eeefbd816e25d1e130602e0a5f824d6915b12 Mon Sep 17 00:00:00 2001 +From 48ecd2dcbb7123ef85dbfeb88fa3e3a75f0f13f1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 060/N] cygpty isatty diff --git a/mingw-w64-python/0061-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch index d1bbf51688..c4ab563536 100644 --- a/mingw-w64-python/0061-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0061-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From 20e6ae1657b35dd58fec49ebd93c8388b6f2756d Mon Sep 17 00:00:00 2001 +From 9933c616e7f8ffd6d745c2d6898b5f618e949288 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 061/N] disable broken gdbm module @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 6f4730d..4d8dc48 100644 +index 8e1a822..b163d4c 100644 --- a/setup.py +++ b/setup.py -@@ -1408,7 +1408,7 @@ class PyBuildExt(build_ext): +@@ -1410,7 +1410,7 @@ class PyBuildExt(build_ext): if dbm_args: dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":") else: diff --git a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index 0597099722..1970c2033a 100644 --- a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From b7299adb0b8100942f45e9eb9a0e5ef951ef998d Mon Sep 17 00:00:00 2001 +From 5228159754cf8fd05e571af07680856c789be803 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 062/N] build: link win resource files and build pythonw @@ -95,7 +95,7 @@ index 6d49228..fd3d142 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index d97844f..9eed603 100644 +index e3dfab7..76e7c2d 100644 --- a/configure.ac +++ b/configure.ac @@ -1350,6 +1350,9 @@ fi @@ -108,7 +108,7 @@ index d97844f..9eed603 100644 AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) -@@ -5877,10 +5880,33 @@ AC_MSG_RESULT(done) +@@ -5876,10 +5879,33 @@ AC_MSG_RESULT(done) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" diff --git a/mingw-w64-python/0063-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch index 69e94e8e99..aa655c4c3a 100644 --- a/mingw-w64-python/0063-3.7-mpdec-mingw.patch +++ b/mingw-w64-python/0063-3.7-mpdec-mingw.patch @@ -1,4 +1,4 @@ -From 497e7da62c91dae5885c2c008bbf4c0cf2674484 Mon Sep 17 00:00:00 2001 +From 7a0df95df28891098cfd005480db24f1ad365b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:17 +0530 @@ -9,10 +9,10 @@ Subject: [PATCH 063/N] 3.7 mpdec mingw 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 4d8dc48..d376299 100644 +index b163d4c..c2fa950 100644 --- a/setup.py +++ b/setup.py -@@ -2293,7 +2293,7 @@ class PyBuildExt(build_ext): +@@ -2295,7 +2295,7 @@ class PyBuildExt(build_ext): undef_macros = [] if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): include_dirs = [] diff --git a/mingw-w64-python/0064-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch index c664008bb1..5f4c2f188c 100644 --- a/mingw-w64-python/0064-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -1,4 +1,4 @@ -From a082473053ab623768a491fbdfe5e8844dbef47c Mon Sep 17 00:00:00 2001 +From 2b5faf6d690f858fee96f2c0cacb9d70d6dce358 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 064/N] disable readline @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d376299..1e4f9e5 100644 +index c2fa950..5cb6340 100644 --- a/setup.py +++ b/setup.py -@@ -1006,7 +1006,10 @@ class PyBuildExt(build_ext): +@@ -1008,7 +1008,10 @@ class PyBuildExt(build_ext): def detect_readline_curses(self): # readline diff --git a/mingw-w64-python/0065-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch index b9fb64d39f..1f52b65612 100644 --- a/mingw-w64-python/0065-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -1,4 +1,4 @@ -From d16c515f1b7daf1ec4907bb6553a21d8aa79208f Mon Sep 17 00:00:00 2001 +From 0b3bba81ad378b3b066ff8ac731504dc43ca48a7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 065/N] fix isselectable diff --git a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index a7814fc886..b9d92805fe 100644 --- a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 4ae7b41506418a80dc2207db09dcde0dee95dd25 Mon Sep 17 00:00:00 2001 +From 0481a789688abc85515cbb7c2bce6c5116d6f3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:19 +0530 diff --git a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch index 4f90df2582..cde64a68ea 100644 --- a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From 6fc673a188ce4b552cf5bdd76271e159fe268667 Mon Sep 17 00:00:00 2001 +From 6ce1a86d6e4ba68acda926d20673207f8743dd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:20 +0530 diff --git a/mingw-w64-python/0068-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch index ff96c8a37c..9fbea17b61 100644 --- a/mingw-w64-python/0068-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From 085855f074cd37e9936c57e9d9c8938b3821d325 Mon Sep 17 00:00:00 2001 +From 50a2c1f39b9d347264a7ad34ef5bfcd2bf289edf Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 068/N] sqlite3 module defines @@ -8,10 +8,10 @@ Subject: [PATCH 068/N] sqlite3 module defines 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 1e4f9e5..4433082 100644 +index 5cb6340..0145e58 100644 --- a/setup.py +++ b/setup.py -@@ -1563,10 +1563,7 @@ class PyBuildExt(build_ext): +@@ -1565,10 +1565,7 @@ class PyBuildExt(build_ext): '_sqlite/util.c', ] sqlite_defines = [] diff --git a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index a03aa8ded5..4e52214f29 100644 --- a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 633a10ccfe845317a554b81eacad8bc047db6006 Mon Sep 17 00:00:00 2001 +From 67f0b565939896e65628dc1c3e878bbb379e1206 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 069/N] configure.ac: fix inet_pton check @@ -12,7 +12,7 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index 9eed603..d4bd1d1 100644 +index 76e7c2d..00adda1 100644 --- a/configure.ac +++ b/configure.ac @@ -4286,10 +4286,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ diff --git a/mingw-w64-python/0070-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch index 83bfc6a190..b8053356bc 100644 --- a/mingw-w64-python/0070-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0070-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From a2adb3b1813a50dd0fe01a41dc285d2161bb795c Mon Sep 17 00:00:00 2001 +From 2157c9f4958ffb7617ae015a2c72ad5d993f4b81 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 070/N] set venv activate path unix diff --git a/mingw-w64-python/0071-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch index 6475358d3b..94d04b2246 100644 --- a/mingw-w64-python/0071-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 69f75280a041d3c896f5349dfb6ce9a4a5436610 Mon Sep 17 00:00:00 2001 +From a23e3abe3a2ceb28a880b1b568bbba4f1ac2c03d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 071/N] venv creation fixes diff --git a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch index 7f1c393a8e..450d167da6 100644 --- a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From 88ca22ab8f9389cef4f59ba22263521e9e812e4c Mon Sep 17 00:00:00 2001 +From aa4e6ec5011ada849755b91ea8a9249576f288c1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 072/N] pass gen profile ldflags diff --git a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index f4af7a3055..c41bcbb72a 100644 --- a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From 2347d7d4f966ff4eb69c1467934298618139c860 Mon Sep 17 00:00:00 2001 +From c89a342b31623f64163f47e13b93dfb82d4ee94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:29 +0530 @@ -21,10 +21,10 @@ index 87e04de..3900190 100644 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/configure.ac b/configure.ac -index d4bd1d1..da43ea0 100644 +index 00adda1..0247a1f 100644 --- a/configure.ac +++ b/configure.ac -@@ -5162,7 +5162,7 @@ AC_MSG_RESULT($LDVERSION) +@@ -5161,7 +5161,7 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) diff --git a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index a1dfba1c58..4e262623a8 100644 --- a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 00845689609c8a686c27a546f42d9885cee1430f Mon Sep 17 00:00:00 2001 +From 320d4e20eb8cadc43ff39028866457af5ea3dd31 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 074/N] importlib bootstrap path sep @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index fe31f43..229d9aa 100644 +index f3828b1..5dafdfe 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -1674,6 +1674,10 @@ def _setup(_bootstrap_module): +@@ -1683,6 +1683,10 @@ def _setup(_bootstrap_module): else: raise ImportError('importlib requires posix or nt') diff --git a/mingw-w64-python/0075-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch index 5ceed19080..abd427c92a 100644 --- a/mingw-w64-python/0075-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From 9b2ffb2eae17a32f862bebb289faebbc38704ffb Mon Sep 17 00:00:00 2001 +From 0c6bfbbfe1bedcab925cfe7c79622ce14d20d023 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 075/N] pathlib path sep diff --git a/mingw-w64-python/0076-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch index bdc146ded7..8c319886fa 100644 --- a/mingw-w64-python/0076-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 9559d653daabba18d30dd3ef4ed2b1f4b7beeee6 Mon Sep 17 00:00:00 2001 +From 11eaff1366c0688bc54026a2d96f1c79846b45df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 diff --git a/mingw-w64-python/0077-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch index c6703692a1..713f1c0e86 100644 --- a/mingw-w64-python/0077-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 97783515a6ca364e4d9830a2d26a5fc53e565c0d Mon Sep 17 00:00:00 2001 +From e6ac2710186565b91ae34f9d18b00dbee5f261ea Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 077/N] fix build testinternalcapi @@ -8,10 +8,10 @@ Subject: [PATCH 077/N] fix build testinternalcapi 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 4433082..e52eacd 100644 +index 0145e58..a31cef9 100644 --- a/setup.py +++ b/setup.py -@@ -984,7 +984,11 @@ class PyBuildExt(build_ext): +@@ -986,7 +986,11 @@ class PyBuildExt(build_ext): depends=['testcapi_long.h'])) # Python Internal C API test module diff --git a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index 9d09c4b0a7..82685ecc8c 100644 --- a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 708910315fbd4219dd87ff95f11b695fc9c51880 Mon Sep 17 00:00:00 2001 +From 9505b3e72221f801f375de86450ea4cf6853d7dd Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 078/N] extend MS_WINDOWS flag @@ -8,7 +8,7 @@ Subject: [PATCH 078/N] extend MS_WINDOWS flag 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index e52eacd..71e6ea5 100644 +index a31cef9..4f697e7 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ if sys.platform == "win32" and "MSYSTEM" in os.environ: diff --git a/mingw-w64-python/0079-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch index a7e02e047c..490dbbab47 100644 --- a/mingw-w64-python/0079-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -1,4 +1,4 @@ -From d60430d1aff530e167ab4fdfdfa23ff21e9339e6 Mon Sep 17 00:00:00 2001 +From ac47103daa3f2523db1e13354a53ae9b059a61e1 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:36 +0530 Subject: [PATCH 079/N] clang arm64 diff --git a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index bd3dc9030f..b32167d623 100644 --- a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 6fcebb6fa95bdf21bdc224c492b8b2ed8e4001f2 Mon Sep 17 00:00:00 2001 +From e03291ed811edbafbee9d67189b9ba991d37ffaf Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:37 +0530 Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve @@ -8,7 +8,7 @@ Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index da43ea0..2ca299a 100644 +index 0247a1f..8cde5ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3072,6 +3072,11 @@ then diff --git a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index 182766a40f..27d222ad22 100644 --- a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 0740c27a55b7944ecda9196eac7e5ba8e35fa7b3 Mon Sep 17 00:00:00 2001 +From 99a2c7b6fd09afc49c4616543c0e19e5f2ed2c4a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 081/N] Don't use os.pathsep to find EOF not all diff --git a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 9b0cd57d76..b8e19783a2 100644 --- a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From 4d16e070def9794b1ec6fb0ec07a0d09f6703541 Mon Sep 17 00:00:00 2001 +From b3f3fbe2163378ad77906e6e6b47281c1cc6d565 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 082/N] Fix extension suffix for c-extensions on mingw @@ -69,7 +69,7 @@ index bd34310..60fb603 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 2ca299a..11872dc 100644 +index 8cde5ef..dda57c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2832,7 +2832,7 @@ if test -z "$SHLIB_SUFFIX"; then @@ -81,7 +81,7 @@ index 2ca299a..11872dc 100644 esac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -5127,6 +5127,68 @@ esac +@@ -5126,6 +5126,68 @@ esac # check for endianness AC_C_BIGENDIAN @@ -150,7 +150,7 @@ index 2ca299a..11872dc 100644 # ABI version string for Python extension modules. This appears between the # periods in shared library file names, e.g. foo..so. It is calculated # from the following attributes which affect the ABI of this Python build (in -@@ -5159,7 +5221,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -5158,7 +5220,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST(EXT_SUFFIX) @@ -164,7 +164,7 @@ index 2ca299a..11872dc 100644 AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -5831,12 +5898,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5830,12 +5897,6 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index ae930bbc2f..ad020a02d1 100644 --- a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From ad6c62686c8ab254bf39b12f022da558f971e746 Mon Sep 17 00:00:00 2001 +From 1e2b5e19ce461468a3c7b411ce6d39dfcc159c54 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 083/N] Change the `get_platform()` method in sysconfig diff --git a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index ba011d91db..2011695d73 100644 --- a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From a7788dfddf5093a98a150ae80f07c4e422b788be Mon Sep 17 00:00:00 2001 +From 593c93c89426a4399477862f8c854f1753549f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 diff --git a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index a7ebeee02f..849e169b7d 100644 --- a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 3248618ff70ee55c54bc325d5dcc894f29f1b9fe Mon Sep 17 00:00:00 2001 +From eb605091656b922dae210abba844eb04ee6c846f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:22 +0530 diff --git a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index ed6a0650f4..29e76227b4 100644 --- a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From d8641e86487fdcbb8a6cf3486e3ecfd2f0ef0eb0 Mon Sep 17 00:00:00 2001 +From a6829b9208ca5e89b7cde5856fa74fda1c6fb721 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 086/N] distutils: MINGW build extensions with GCC diff --git a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index 0ec187df6f..1b917f6d28 100644 --- a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From ecb4ca01159962cbf3c66e4242583e6cdc8ccd02 Mon Sep 17 00:00:00 2001 +From a95c530b081aa2950da922ffd34ecdeef792005b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:35 +0530 diff --git a/mingw-w64-python/0088-distutils-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch index ab906df1bb..12ef2e926c 100644 --- a/mingw-w64-python/0088-distutils-find-import-library.patch +++ b/mingw-w64-python/0088-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From fbb6aa9546fe88f2ef3111958b86ab32199e890f Mon Sep 17 00:00:00 2001 +From 30226edc2050f2ee20a827457ffa6c7f923b1546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:36 +0530 diff --git a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index adcba21b97..9fd0f466f0 100644 --- a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From 7f323f7b626ea0948e135152cbd4befd47506276 Mon Sep 17 00:00:00 2001 +From fbe701a809e2eca1e71ccb8042aaf90ac73bcf71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index 9ec9220aab..e7f8e3c388 100644 --- a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From 5e1dae781cfdd94792d7ee6e45a694a247e55002 Mon Sep 17 00:00:00 2001 +From 6b101748cfddcca92dd1212124005aca974bd8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch index 585a9bd750..0a02d9a1c4 100644 --- a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From c07dcfbd45bf8440d7178f912c7c9648966042b5 Mon Sep 17 00:00:00 2001 +From 89701176c17dbf7cbb694b1c770d0bafc25a19f4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 091/N] distutils: mingw sysconfig like posix diff --git a/mingw-w64-python/0092-distutils-get_versions-fixes.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch index cae1c8a0f1..c0a05887e6 100644 --- a/mingw-w64-python/0092-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0092-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From 0df2d034bb72529a6fb719c5c3e430a98b5cc211 Mon Sep 17 00:00:00 2001 +From 9bda981cf45ebfcff18d7e5fe2a608920fe1075a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 092/N] distutils: get_versions() fixes diff --git a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch index fd0743453e..1a4feea546 100644 --- a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From 1909d79d7a506d55e07b708e39b5620b2bdf27c5 Mon Sep 17 00:00:00 2001 +From 895db8936b79b07e671e80856be967c5e2149559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 5b72d1a1c3..9c8e6803b5 100644 --- a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From c9dcbae3befb667d806f882ac9fff0defb38d9a1 Mon Sep 17 00:00:00 2001 +From 6d177f751f34f631be742e28ca4a5a71f1232b66 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 094/N] distutils: msys convert_path fix and root hack diff --git a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index 6caf1d3a02..621eacf382 100644 --- a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From b6462264592f88d2930107496aea431a52516f2f Mon Sep 17 00:00:00 2001 +From 35730adeb9d2ce29f5da78e817b4bad2eb195a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:04 +0530 diff --git a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index b8bc1fa804..698f063266 100644 --- a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From 9536f0bbb21ebe13c7f539540a5e38dbd875bc51 Mon Sep 17 00:00:00 2001 +From 8ca4acd537111c3be58a67750b6cd87b95a54545 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 096/N] distutils: cygwinccompiler dont strip modules if diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch index 5900a11f40..f3a903e8a5 100644 --- a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From 42bab63733b59dad0ebbe18b1f6d18ba588240df Mon Sep 17 00:00:00 2001 +From cbb3f88ebcaf8416869901bc0ee5a71ff22972f9 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 097/N] distutils: get compilers from env vars diff --git a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index ff0b35aa97..4dbbf44fdb 100644 --- a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From ebe7844e3d6d1b64f155033731fd44f1770243f0 Mon Sep 17 00:00:00 2001 +From b71f19f775d7fc3ba41b2bd689428fc4d8199352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:28 +0530 diff --git a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch index c94fb5b06c..77fc6d6f55 100644 --- a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From dd68c5c4b419561600a9ad34a2741395a166ac4f Mon Sep 17 00:00:00 2001 +From 4f4ca7d009a1b52533baa54c040b13cd5760628a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 099/N] distutils: fix msvc9 import diff --git a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index ce9e4cff95..6f137e2063 100644 --- a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From 041c30f5c5e8e43c72147b50d0f4b2eefdb17d3d Mon Sep 17 00:00:00 2001 +From c5ecc33a0ad265c08a6da56e822517c2aada6365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch index 6afcb8dae3..909748288b 100644 --- a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From f86f222d41d6ee022b1eefd2494c10e97d54b16e Mon Sep 17 00:00:00 2001 +From 474ae21ca1335649dc8e024a2a5da466219898e2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 101/N] distutils: Change the `get_platform()` method in diff --git a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index 2818a264c1..6169aafdc7 100644 --- a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 61995cb8065dde6dcc0eec9ecb5ef2aa3170fef8 Mon Sep 17 00:00:00 2001 +From 7a48d9483e6e3e7681283bc9e856970b4e6882c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 @@ -25,10 +25,10 @@ index 4430d21..99bed41 100644 ########################################################################## # Parser diff --git a/configure.ac b/configure.ac -index 11872dc..fb90929 100644 +index dda57c9..13bb97d 100644 --- a/configure.ac +++ b/configure.ac -@@ -5569,10 +5569,17 @@ then +@@ -5568,10 +5568,17 @@ then [Define if you have struct stat.st_mtimensec]) fi @@ -48,10 +48,10 @@ index 11872dc..fb90929 100644 AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py -index 71e6ea5..badb119 100644 +index 4f697e7..efc9ec7 100644 --- a/setup.py +++ b/setup.py -@@ -1107,7 +1107,7 @@ class PyBuildExt(build_ext): +@@ -1109,7 +1109,7 @@ class PyBuildExt(build_ext): if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) if not CROSS_COMPILING: diff --git a/mingw-w64-python/0103-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch index ab645dab06..fe56b19733 100644 --- a/mingw-w64-python/0103-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0103-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 225617465f44e8c1d9a3d678f2fd63c979dca417 Mon Sep 17 00:00:00 2001 +From 4f3e0b488acf29ec0d6c27198424c0841f310fc0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 103/N] tests: fix test_bytes diff --git a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index 864887ef3d..dfbe3c4af4 100644 --- a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From 5f3accecfce4d1284e7fad8fdc01165ee1bb7488 Mon Sep 17 00:00:00 2001 +From 24fa5b51121c13b1450d1cf8a9fd69445f793e1e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 104/N] time: fix strftime not raising for invalid year diff --git a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index ec468c7d46..d34884f9e2 100644 --- a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From fdf596a74bc3f361136eab3a23a0fedd1bc2e9e2 Mon Sep 17 00:00:00 2001 +From 87dc4a7a0878c944af7c6544d9e18f65bd0730a1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 105/N] ctypes: find_library('c') should return None with diff --git a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index a14ef32098..745a559b6d 100644 --- a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 54da3cecac7208fce008b7f05e19df0e45e245bc Mon Sep 17 00:00:00 2001 +From 92035a57d06a23693bcab4eba21fc8d19a8b00d7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 106/N] build: Disable checks for dlopen/dlfcn @@ -10,7 +10,7 @@ checks for it. 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index fb90929..bfa18be 100644 +index 13bb97d..2c7b92b 100644 --- a/configure.ac +++ b/configure.ac @@ -2430,7 +2430,7 @@ dnl AC_MSG_RESULT($cpp_type) @@ -25,7 +25,7 @@ index fb90929..bfa18be 100644 @@ -2444,6 +2444,12 @@ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ - sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) + sys/endian.h sys/sysmacros.h linux/auxvec.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) + +case $host in + *-*-mingw*) ;; @@ -49,7 +49,7 @@ index fb90929..bfa18be 100644 AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # checks for uuid.h location -@@ -5026,7 +5037,10 @@ then +@@ -5025,7 +5036,10 @@ then [define to 1 if your sem_getvalue is broken.]) fi diff --git a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index f1ebc7e128..c212636bae 100644 --- a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From acc12ead338af28f76fa1164d2aff52bba7f06cf Mon Sep 17 00:00:00 2001 +From a472d496c595905ad8f346651a9fb61d9a2a50f3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 107/N] Fix install location of the import library diff --git a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 484c60f53b..a4e7380838 100644 --- a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From ecf4b76f6cea01e049ae43f11482dc1688f669a3 Mon Sep 17 00:00:00 2001 +From 82ec304359ac067a5372273793047f928f02570b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 108/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module diff --git a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index be7f9ad3fa..d577699f4e 100644 --- a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From 4ff3883e35104746d0284523bdf80dc7f1bd36c3 Mon Sep 17 00:00:00 2001 +From 90a611fd2469d096e6b3936f5d6c61b7e64400ce Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 109/N] build: Integrate venvlauncher build/installation into diff --git a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index bb240967e8..1625852729 100644 --- a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From 15e69064ff0d465ee518919a3f83028e302ad4fb Mon Sep 17 00:00:00 2001 +From 9562e2886b860eb9d95a49d2ee1e8de952800ad0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version @@ -8,7 +8,7 @@ Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index bfa18be..77982d0 100644 +index 2c7b92b..7a7ade5 100644 --- a/configure.ac +++ b/configure.ac @@ -3489,6 +3489,11 @@ else diff --git a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index d973be1262..fede115218 100644 --- a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From 6f3fc42d39c6d0009933bde5a2322a54de764846 Mon Sep 17 00:00:00 2001 +From f713187266cda921fcf061663116834d6109a8c8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 111/N] configure.ac: don't check for clock_ functions @@ -9,7 +9,7 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 77982d0..f986188 100644 +index 7a7ade5..f19036d 100644 --- a/configure.ac +++ b/configure.ac @@ -4381,6 +4381,9 @@ char *r = crypt_r("", "", &d); diff --git a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index 905e4d7c04..cb42f5f37a 100644 --- a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From 0762b765e0c3463fc531aa3458ac3645e27c003c Mon Sep 17 00:00:00 2001 +From f150637ba2355ea95234edf669aa186d3f62ec23 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 112/N] expanduser: normpath paths coming from env vars diff --git a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index f9d7645c6b..f1ed23b988 100644 --- a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch @@ -1,4 +1,4 @@ -From fc6619697a171ecfe63a933e3f93b1841ce13cc2 Mon Sep 17 00:00:00 2001 +From 2528c80bd1cc9c86199aa7bd14604501c8ba0a14 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9 @@ -160,10 +160,10 @@ index 7c0eeab..2d03b74 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index f986188..f5be44c 100644 +index f19036d..0aa6c8d 100644 --- a/configure.ac +++ b/configure.ac -@@ -5980,7 +5980,7 @@ AC_MSG_RESULT(done) +@@ -5979,7 +5979,7 @@ AC_MSG_RESULT(done) # For mingw build need additional library for linking case $host in *-*-mingw*) diff --git a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch similarity index 99% rename from mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch rename to mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch index b729fc63e2..4e26c7654b 100644 --- a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,7 +1,7 @@ -From 1f3d70f51035932de24c2df7084f9224fbd632ea Mon Sep 17 00:00:00 2001 +From 877879dde596b3e3c230ef66c93ce5af5293b83f Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 -Subject: [PATCH 115/N] CI: test the build and add some mingw specific tests +Subject: [PATCH 114/N] CI: test the build and add some mingw specific tests --- .github/workflows/mingw.yml | 209 ++++++++++++++++++++++++ diff --git a/mingw-w64-python/0116-decimal-backport-build-fixes.patch b/mingw-w64-python/0115-decimal-backport-build-fixes.patch similarity index 91% rename from mingw-w64-python/0116-decimal-backport-build-fixes.patch rename to mingw-w64-python/0115-decimal-backport-build-fixes.patch index ce37618528..98eb2dbff3 100644 --- a/mingw-w64-python/0116-decimal-backport-build-fixes.patch +++ b/mingw-w64-python/0115-decimal-backport-build-fixes.patch @@ -1,7 +1,7 @@ -From 96d183dd8ee2b5ff4380f230e2a24a1125a9851b Mon Sep 17 00:00:00 2001 +From ac2803d0d626ba30d73a3e4ad0ad55269e950776 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:55:32 +0200 -Subject: [PATCH 116/N] decimal: backport build fixes +Subject: [PATCH 115/N] decimal: backport build fixes part of https://github.com/python/cpython/pull/24962 --- diff --git a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch similarity index 82% rename from mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch rename to mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch index 6e5d0eace8..822678d726 100644 --- a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch @@ -1,7 +1,7 @@ -From d5a8017fac49caaf9ec52f0f46760ce62f2849cc Mon Sep 17 00:00:00 2001 +From f23ad68a07a532e3d196b9c70f280874e3e42a0d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 -Subject: [PATCH 117/N] smoketests: test that _decimal exists +Subject: [PATCH 116/N] smoketests: test that _decimal exists --- mingw_smoketests.py | 3 +++ diff --git a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch similarity index 89% rename from mingw-w64-python/0118-Prefer-sysconfig.python_build.patch rename to mingw-w64-python/0117-Prefer-sysconfig.python_build.patch index c4e048bda7..bffd0788e9 100644 --- a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch @@ -1,7 +1,7 @@ -From 16683cb6295f388e9425517edecdd5368343a62c Mon Sep 17 00:00:00 2001 +From 2f6c46cdb54145bdc480d127bfaab88418ef2d67 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 -Subject: [PATCH 118/N] Prefer sysconfig.python_build +Subject: [PATCH 117/N] Prefer sysconfig.python_build --- Lib/distutils/command/build_ext.py | 2 +- diff --git a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch similarity index 98% rename from mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch rename to mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch index ffed3c27d9..86e982aa3e 100644 --- a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,7 +1,7 @@ -From 662d8c68e4559c6deebf5abb78767b81d9266fe9 Mon Sep 17 00:00:00 2001 +From 28d3413a740ff91c3c8556d5bce7c15245ec327a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 -Subject: [PATCH 119/N] distutils: remove checks for ancient gcc/binutils +Subject: [PATCH 118/N] distutils: remove checks for ancient gcc/binutils The versions checked here are 20 years old. Also dllwrap has started to emit a deprecation warning in the latest release diff --git a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch similarity index 89% rename from mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch rename to mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch index e0e056e9ff..479689bf66 100644 --- a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,7 +1,7 @@ -From 382c91ed3b11b65cfaeebb3d02f8886b401f4ab0 Mon Sep 17 00:00:00 2001 +From 1cd69ce0b6864315d371cbb8ae0824636dfff188 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 -Subject: [PATCH 120/N] distutils: split CC env var before passing to +Subject: [PATCH 119/N] distutils: split CC env var before passing to subprocess In case CC="ccache gcc" then subprocess would interpret it as one command diff --git a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch similarity index 85% rename from mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch rename to mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch index 0fe3859823..d0d9058e6c 100644 --- a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch @@ -1,7 +1,7 @@ -From 667b4b663c1382c6daa8bac219bdeb97419b4b73 Mon Sep 17 00:00:00 2001 +From 5cdd7f1d1a3e396543e237028c81190a24136f14 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 -Subject: [PATCH 121/N] _testconsole.c: Fix casing & path sep +Subject: [PATCH 120/N] _testconsole.c: Fix casing & path sep --- PC/_testconsole.c | 4 ++-- diff --git a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch similarity index 91% rename from mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch rename to mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch index d9cfcddf57..28f9cc1184 100644 --- a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch @@ -1,7 +1,7 @@ -From 4f4a764595a50871a5955a0e5b53fbb6590e1bb2 Mon Sep 17 00:00:00 2001 +From 64fbfe9373dec7d73f7e305fd590fca6274a475b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Nov 2021 12:18:06 +0200 -Subject: [PATCH 122/N] Return consistent architecture markers for python on +Subject: [PATCH 121/N] Return consistent architecture markers for python on mingw/armv7 --- @@ -51,10 +51,10 @@ index 2d935fe..fc8132c 100644 #define ARCH_SUFFIX " 32 bit" #endif diff --git a/configure.ac b/configure.ac -index f5be44c..81e94c3 100644 +index 0aa6c8d..06e93ab 100644 --- a/configure.ac +++ b/configure.ac -@@ -5209,6 +5209,9 @@ case $host_os in +@@ -5208,6 +5208,9 @@ case $host_os in aarch64-*-mingw*) PYD_PLATFORM_TAG+="mingw_aarch64" ;; diff --git a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch similarity index 91% rename from mingw-w64-python/0123-distutils-add-back-gcc_version.patch rename to mingw-w64-python/0122-distutils-add-back-gcc_version.patch index 3703f98e2a..02dbf8b87a 100644 --- a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch @@ -1,7 +1,7 @@ -From cd85d3a248958e37c27fa2a75302c9bf74f74bf2 Mon Sep 17 00:00:00 2001 +From 73cc65553ca83137a5b3abe7f213f60760a1b923 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 -Subject: [PATCH 123/N] distutils: add back gcc_version +Subject: [PATCH 122/N] distutils: add back gcc_version older numpy depends on it and there are users building it directly via pip --- diff --git a/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch similarity index 91% rename from mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch rename to mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch index 9e8b1a5b1c..2ff887c6bf 100644 --- a/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,7 +1,7 @@ -From a0c70e5ea03a000ac5cc27ed5c64c21c6799667a Mon Sep 17 00:00:00 2001 +From aa01d34ce3557e29dda2d614be2343f90bd20582 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 -Subject: [PATCH 124/N] fix mingw cross compiling in setup.py +Subject: [PATCH 123/N] fix mingw cross compiling in setup.py gcc outputs with `;` path delimiter on mingw, so use `os.pathsep` instead of `:` (assuming this is a host rather than target decision) @@ -11,10 +11,10 @@ clang does not output `LIBRARY_PATH` with `-E -v`, so add an extra call to `-pri 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index badb119..2d07ea3 100644 +index efc9ec7..6b0e709 100644 --- a/setup.py +++ b/setup.py -@@ -713,14 +713,25 @@ class PyBuildExt(build_ext): +@@ -715,14 +715,25 @@ class PyBuildExt(build_ext): elif line.startswith("End of search list"): in_incdirs = False elif (is_gcc or is_clang) and line.startswith("LIBRARY_PATH"): diff --git a/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch similarity index 88% rename from mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch rename to mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch index ba708ae4b7..13cf897477 100644 --- a/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -1,7 +1,7 @@ -From 20616d4f465d8649a0e73c84d3e7587162da3d2d Mon Sep 17 00:00:00 2001 +From 2c29dd58940bec8ae0cdbde76cb1b607a61e689d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 21 Jan 2022 19:25:44 +0530 -Subject: [PATCH 125/N] Use actions/setup-python for setting up correct +Subject: [PATCH 124/N] Use actions/setup-python for setting up correct version in cross build Fixes https://github.com/msys2-contrib/cpython-mingw/issues/67 diff --git a/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch similarity index 93% rename from mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch rename to mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch index 2cfaffc4bd..f12839b2eb 100644 --- a/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch +++ b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch @@ -1,7 +1,7 @@ -From 3210f304dbb65efb04a6525913a4dc1e0003fb46 Mon Sep 17 00:00:00 2001 +From 1530d391f3d2287c65070e565e06c21c9bcd9e97 Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:21:07 +0500 -Subject: [PATCH 126/N] Fix buffer overflow in Py_GetSepW(). +Subject: [PATCH 125/N] Fix buffer overflow in Py_GetSepW(). --- Python/pathconfig.c | 28 ++++++++++++++++++++++++++-- diff --git a/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch similarity index 89% rename from mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch rename to mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch index a8a7e5ff87..30e058a960 100644 --- a/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch +++ b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch @@ -1,7 +1,7 @@ -From 473806045dc48fa00d29c6000b03210ddd700bf6 Mon Sep 17 00:00:00 2001 +From be06ed5d1e2c038a4cccb8fb3b0e70869505447f Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:23:29 +0500 -Subject: [PATCH 127/N] Remove unnecessary strlen() in Py_NormalizeSepsW(). +Subject: [PATCH 126/N] Remove unnecessary strlen() in Py_NormalizeSepsW(). --- Python/pathconfig.c | 6 ++++-- diff --git a/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch similarity index 85% rename from mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch rename to mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch index dd7ebad5e9..cd675ffeab 100644 --- a/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,7 +1,7 @@ -From 12d1cb5b7c60901e36163b3e0599f11703c4946a Mon Sep 17 00:00:00 2001 +From 991cbd5348887ea1f10654a0c8a62e9f72aca786 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 -Subject: [PATCH 128/N] handle ncursesw pkg-config when cross-compiling +Subject: [PATCH 127/N] handle ncursesw pkg-config when cross-compiling strip extra args from pkg-config --cflags-only-I, setup.py is only expecting a single path. @@ -12,7 +12,7 @@ Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH sho 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 81e94c3..ca712f1 100644 +index 06e93ab..5d8586e 100644 --- a/configure.ac +++ b/configure.ac @@ -3403,7 +3403,7 @@ else @@ -24,7 +24,7 @@ index 81e94c3..ca712f1 100644 else LIBFFI_INCLUDEDIR="" fi -@@ -5597,7 +5597,7 @@ then +@@ -5596,7 +5596,7 @@ then fi if test -n "$PKG_CONFIG"; then @@ -33,7 +33,7 @@ index 81e94c3..ca712f1 100644 else NCURSESW_INCLUDEDIR="" fi -@@ -5605,9 +5605,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) +@@ -5604,9 +5604,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) # first curses header check ac_save_cppflags="$CPPFLAGS" @@ -45,10 +45,10 @@ index 81e94c3..ca712f1 100644 AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py -index 2d07ea3..7ef50e9 100644 +index 6b0e709..43e5ee0 100644 --- a/setup.py +++ b/setup.py -@@ -1117,8 +1117,7 @@ class PyBuildExt(build_ext): +@@ -1119,8 +1119,7 @@ class PyBuildExt(build_ext): panel_library = 'panel' if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) diff --git a/mingw-w64-python/0129-Use-CC-instead-of-cc.patch b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch similarity index 78% rename from mingw-w64-python/0129-Use-CC-instead-of-cc.patch rename to mingw-w64-python/0128-Use-CC-instead-of-cc.patch index 2b54d509a0..679f2629c6 100644 --- a/mingw-w64-python/0129-Use-CC-instead-of-cc.patch +++ b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch @@ -1,17 +1,17 @@ -From b9d24754cbc8c3c5587164e98554103c1ffc3b3f Mon Sep 17 00:00:00 2001 +From f56d833867487ffd8f27191006c3788efbc3489a Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 28 Feb 2022 00:06:06 +0700 -Subject: [PATCH 129/N] Use CC instead of cc +Subject: [PATCH 128/N] Use CC instead of cc --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 7ef50e9..36ecc3b 100644 +index 43e5ee0..b967544 100644 --- a/setup.py +++ b/setup.py -@@ -722,7 +722,7 @@ class PyBuildExt(build_ext): +@@ -724,7 +724,7 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, line.strip()) if is_clang: diff --git a/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch new file mode 100644 index 0000000000..0d55acaae3 --- /dev/null +++ b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch @@ -0,0 +1,41 @@ +From 6284f42f345c9ca9796f977c14ee26983d5223fd Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 21 Feb 2022 08:16:23 -0800 +Subject: [PATCH 129/N] bpo-46811: Make test suite support Expat >=2.4.5 + (GH-31453) (GH-31469) + +Curly brackets were never allowed in namespace URIs +according to RFC 3986, and so-called namespace-validating +XML parsers have the right to reject them a invalid URIs. + +libexpat >=2.4.5 has become strcter in that regard due to +related security issues; with ET.XML instantiating a +namespace-aware parser under the hood, this test has no +future in CPython. + +References: +- https://datatracker.ietf.org/doc/html/rfc3968 +- https://www.w3.org/TR/xml-names/ + +Also, test_minidom.py: Support Expat >=2.4.5 +(cherry picked from commit 2cae93832f46b245847bdc252456ddf7742ef45e) + +Co-authored-by: Sebastian Pipping + +Co-authored-by: Sebastian Pipping +--- + .../NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst + +diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst +new file mode 100644 +index 0000000..6969bd1 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst +@@ -0,0 +1 @@ ++Make test suite support Expat >=2.4.5 +-- +2.35.1 + diff --git a/mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch similarity index 93% rename from mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch rename to mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch index 995692e529..dcf8ce0308 100644 --- a/mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch +++ b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch @@ -1,7 +1,7 @@ -From 6407bc7c4a164ecb35003748179a8d69c6ca65ef Mon Sep 17 00:00:00 2001 +From b3ea043fee25e904c927dfa69ff49fcbc94af20f Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 14 Mar 2022 19:28:06 +0530 -Subject: [PATCH 131/N] Avoid using sysconfig in site.py +Subject: [PATCH 130/N] Avoid using sysconfig in site.py This would significantly decrease the startup time. The importime can be calculated using diff --git a/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch b/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch deleted file mode 100644 index 9ce5237c9c..0000000000 --- a/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 5574284f68f8014dee419b9bba1dc5a18362562e Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Mon, 21 Feb 2022 08:16:23 -0800 -Subject: [PATCH 130/N] bpo-46811: Make test suite support Expat >=2.4.5 - (GH-31453) (GH-31469) - -Curly brackets were never allowed in namespace URIs -according to RFC 3986, and so-called namespace-validating -XML parsers have the right to reject them a invalid URIs. - -libexpat >=2.4.5 has become strcter in that regard due to -related security issues; with ET.XML instantiating a -namespace-aware parser under the hood, this test has no -future in CPython. - -References: -- https://datatracker.ietf.org/doc/html/rfc3968 -- https://www.w3.org/TR/xml-names/ - -Also, test_minidom.py: Support Expat >=2.4.5 -(cherry picked from commit 2cae93832f46b245847bdc252456ddf7742ef45e) - -Co-authored-by: Sebastian Pipping - -Co-authored-by: Sebastian Pipping ---- - Lib/test/test_minidom.py | 17 +++++++++++++++-- - Lib/test/test_xml_etree.py | 6 ------ - .../2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 + - 3 files changed, 16 insertions(+), 8 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst - -diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py -index 1663b1f..9762025 100644 ---- a/Lib/test/test_minidom.py -+++ b/Lib/test/test_minidom.py -@@ -6,10 +6,12 @@ import io - from test import support - import unittest - -+import pyexpat - import xml.dom.minidom - - from xml.dom.minidom import parse, Node, Document, parseString - from xml.dom.minidom import getDOMImplementation -+from xml.parsers.expat import ExpatError - - - tstfile = support.findfile("test.xml", subdir="xmltestdata") -@@ -1147,7 +1149,13 @@ class MinidomTest(unittest.TestCase): - - # Verify that character decoding errors raise exceptions instead - # of crashing -- self.assertRaises(UnicodeDecodeError, parseString, -+ if pyexpat.version_info >= (2, 4, 5): -+ self.assertRaises(ExpatError, parseString, -+ b'') -+ self.assertRaises(ExpatError, parseString, -+ b'Comment \xe7a va ? Tr\xe8s bien ?') -+ else: -+ self.assertRaises(UnicodeDecodeError, parseString, - b'Comment \xe7a va ? Tr\xe8s bien ?') - - doc.unlink() -@@ -1609,7 +1617,12 @@ class MinidomTest(unittest.TestCase): - self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE) - - def testExceptionOnSpacesInXMLNSValue(self): -- with self.assertRaisesRegex(ValueError, 'Unsupported syntax'): -+ if pyexpat.version_info >= (2, 4, 5): -+ context = self.assertRaisesRegex(ExpatError, 'syntax error') -+ else: -+ context = self.assertRaisesRegex(ValueError, 'Unsupported syntax') -+ -+ with context: - parseString('') - - def testDocRemoveChild(self): -diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py -index 23c4cd5..142ce2c 100644 ---- a/Lib/test/test_xml_etree.py -+++ b/Lib/test/test_xml_etree.py -@@ -2159,12 +2159,6 @@ class BugsTest(unittest.TestCase): - b"\n" - b'tãg') - -- def test_issue3151(self): -- e = ET.XML('') -- self.assertEqual(e.tag, '{${stuff}}localname') -- t = ET.ElementTree(e) -- self.assertEqual(ET.tostring(e), b'') -- - def test_issue6565(self): - elem = ET.XML("") - self.assertEqual(summarize_list(elem), ['tag']) -diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst -new file mode 100644 -index 0000000..6969bd1 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst -@@ -0,0 +1 @@ -+Make test suite support Expat >=2.4.5 --- -2.35.1 - diff --git a/mingw-w64-python/0114-Commit-regenerated-importlib.patch b/mingw-w64-python/0131-Commit-regenerated-importlib.patch similarity index 62% rename from mingw-w64-python/0114-Commit-regenerated-importlib.patch rename to mingw-w64-python/0131-Commit-regenerated-importlib.patch index 27b16e89f0..b48f308ced 100644 --- a/mingw-w64-python/0114-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0131-Commit-regenerated-importlib.patch @@ -1,17 +1,20 @@ -From ba0fc684a60cae28806d23a30fafac9c090db205 Mon Sep 17 00:00:00 2001 +From f62f5acdeaed40aee9debba3d88f8f9090c80afd Mon Sep 17 00:00:00 2001 From: Christoph Reiter -Date: Sun, 1 Aug 2021 16:09:12 +0200 -Subject: [PATCH 114/N] Commit regenerated importlib +Date: Fri, 18 Mar 2022 12:22:15 +0100 +Subject: [PATCH 131/N] Commit regenerated importlib It needs a native Python when building which isn't available when cross compiling -Generated using "make regen-importlib" with line endings normalized. +Generated using "regen-importlib" with line endings normalized: + +* make regen-importlib +* dos2unix Python/importlib*.h --- - Python/importlib_external.h | 1321 ++++++++++++++++++----------------- - 1 file changed, 662 insertions(+), 659 deletions(-) + Python/importlib_external.h | 1317 ++++++++++++++++++----------------- + 1 file changed, 660 insertions(+), 657 deletions(-) diff --git a/Python/importlib_external.h b/Python/importlib_external.h -index 6d40249..17f549b 100644 +index 23af2cd..3c0b0a1 100644 --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -109,7 +109,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { @@ -1456,938 +1459,934 @@ index 6d40249..17f549b 100644 - 8,4,2,1,114,19,1,0,0,99,0,0,0,0,0,0, + 8,4,2,1,114,20,1,0,0,99,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,0, - 0,0,115,104,0,0,0,101,0,90,1,100,0,90,2,100, - 1,90,3,100,2,100,3,132,0,90,4,100,4,100,5,132, -@@ -1912,15 +1912,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,0, - 0,67,0,0,0,115,36,0,0,0,124,1,124,0,95,0, - 124,2,124,0,95,1,116,2,124,0,160,3,161,0,131,1, -- 124,0,95,4,124,3,124,0,95,5,100,0,83,0,114,69, -+ 124,0,95,4,124,3,124,0,95,5,100,0,83,0,114,70, - 0,0,0,41,6,218,5,95,110,97,109,101,218,5,95,112, -- 97,116,104,114,135,0,0,0,218,16,95,103,101,116,95,112, -+ 97,116,104,114,136,0,0,0,218,16,95,103,101,116,95,112, - 97,114,101,110,116,95,112,97,116,104,218,17,95,108,97,115, - 116,95,112,97,114,101,110,116,95,112,97,116,104,218,12,95, -- 112,97,116,104,95,102,105,110,100,101,114,169,4,114,142,0, -- 0,0,114,140,0,0,0,114,65,0,0,0,90,11,112,97, -+ 112,97,116,104,95,102,105,110,100,101,114,169,4,114,143,0, -+ 0,0,114,141,0,0,0,114,66,0,0,0,90,11,112,97, - 116,104,95,102,105,110,100,101,114,114,10,0,0,0,114,10, -- 0,0,0,114,11,0,0,0,114,232,0,0,0,188,4,0, -+ 0,0,0,114,11,0,0,0,114,233,0,0,0,188,4,0, - 0,115,8,0,0,0,0,1,6,1,6,1,14,1,122,23, - 95,78,97,109,101,115,112,97,99,101,80,97,116,104,46,95, - 95,105,110,105,116,95,95,99,1,0,0,0,0,0,0,0, -@@ -1931,11 +1931,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 101,116,117,114,110,115,32,97,32,116,117,112,108,101,32,111, - 102,32,40,112,97,114,101,110,116,45,109,111,100,117,108,101, - 45,110,97,109,101,44,32,112,97,114,101,110,116,45,112,97, -- 116,104,45,97,116,116,114,45,110,97,109,101,41,114,96,0, -- 0,0,114,14,0,0,0,41,2,114,21,0,0,0,114,65, -+ 116,104,45,97,116,116,114,45,110,97,109,101,41,114,97,0, -+ 0,0,114,14,0,0,0,41,2,114,21,0,0,0,114,66, - 0,0,0,90,8,95,95,112,97,116,104,95,95,41,2,114, -- 46,1,0,0,114,103,0,0,0,41,4,114,142,0,0,0, -- 114,38,1,0,0,218,3,100,111,116,90,2,109,101,114,10, -+ 47,1,0,0,114,104,0,0,0,41,4,114,143,0,0,0, -+ 114,39,1,0,0,218,3,100,111,116,90,2,109,101,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,23,95, - 102,105,110,100,95,112,97,114,101,110,116,95,112,97,116,104, - 95,110,97,109,101,115,194,4,0,0,115,8,0,0,0,0, -@@ -1945,13 +1945,13 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0, - 3,0,0,0,67,0,0,0,115,28,0,0,0,124,0,160, - 0,161,0,92,2,125,1,125,2,116,1,116,2,106,3,124, -- 1,25,0,124,2,131,2,83,0,114,69,0,0,0,41,4, -- 114,53,1,0,0,114,154,0,0,0,114,21,0,0,0,218, -- 7,109,111,100,117,108,101,115,41,3,114,142,0,0,0,90, -+ 1,25,0,124,2,131,2,83,0,114,70,0,0,0,41,4, -+ 114,54,1,0,0,114,155,0,0,0,114,21,0,0,0,218, -+ 7,109,111,100,117,108,101,115,41,3,114,143,0,0,0,90, - 18,112,97,114,101,110,116,95,109,111,100,117,108,101,95,110, - 97,109,101,90,14,112,97,116,104,95,97,116,116,114,95,110, - 97,109,101,114,10,0,0,0,114,10,0,0,0,114,11,0, -- 0,0,114,48,1,0,0,204,4,0,0,115,4,0,0,0, -+ 0,0,114,49,1,0,0,204,4,0,0,115,4,0,0,0, - 0,1,12,1,122,31,95,78,97,109,101,115,112,97,99,101, - 80,97,116,104,46,95,103,101,116,95,112,97,114,101,110,116, - 95,112,97,116,104,99,1,0,0,0,0,0,0,0,0,0, -@@ -1961,11 +1961,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 4,124,1,161,2,125,2,124,2,100,0,117,1,114,68,124, - 2,106,5,100,0,117,0,114,68,124,2,106,6,114,68,124, - 2,106,6,124,0,95,7,124,1,124,0,95,2,124,0,106, -- 7,83,0,114,69,0,0,0,41,8,114,135,0,0,0,114, -- 48,1,0,0,114,49,1,0,0,114,50,1,0,0,114,46, -- 1,0,0,114,164,0,0,0,114,202,0,0,0,114,47,1, -- 0,0,41,3,114,142,0,0,0,90,11,112,97,114,101,110, -- 116,95,112,97,116,104,114,210,0,0,0,114,10,0,0,0, -+ 7,83,0,114,70,0,0,0,41,8,114,136,0,0,0,114, -+ 49,1,0,0,114,50,1,0,0,114,51,1,0,0,114,47, -+ 1,0,0,114,165,0,0,0,114,203,0,0,0,114,48,1, -+ 0,0,41,3,114,143,0,0,0,90,11,112,97,114,101,110, -+ 116,95,112,97,116,104,114,211,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,218,12,95,114,101,99, - 97,108,99,117,108,97,116,101,208,4,0,0,115,16,0,0, - 0,0,2,12,1,10,1,14,3,18,1,6,1,8,1,6, -@@ -1973,33 +1973,33 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 104,46,95,114,101,99,97,108,99,117,108,97,116,101,99,1, - 0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3, - 0,0,0,67,0,0,0,115,12,0,0,0,116,0,124,0, -- 160,1,161,0,131,1,83,0,114,69,0,0,0,41,2,114, -- 29,1,0,0,114,55,1,0,0,114,13,1,0,0,114,10, -+ 160,1,161,0,131,1,83,0,114,70,0,0,0,41,2,114, -+ 30,1,0,0,114,56,1,0,0,114,14,1,0,0,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,95, - 95,105,116,101,114,95,95,221,4,0,0,115,2,0,0,0, - 0,1,122,23,95,78,97,109,101,115,112,97,99,101,80,97, - 116,104,46,95,95,105,116,101,114,95,95,99,2,0,0,0, - 0,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0, - 67,0,0,0,115,12,0,0,0,124,0,160,0,161,0,124, -- 1,25,0,83,0,114,69,0,0,0,169,1,114,55,1,0, -- 0,41,2,114,142,0,0,0,218,5,105,110,100,101,120,114, -+ 1,25,0,83,0,114,70,0,0,0,169,1,114,56,1,0, -+ 0,41,2,114,143,0,0,0,218,5,105,110,100,101,120,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,11, - 95,95,103,101,116,105,116,101,109,95,95,224,4,0,0,115, - 2,0,0,0,0,1,122,26,95,78,97,109,101,115,112,97, - 99,101,80,97,116,104,46,95,95,103,101,116,105,116,101,109, - 95,95,99,3,0,0,0,0,0,0,0,0,0,0,0,3, - 0,0,0,3,0,0,0,67,0,0,0,115,14,0,0,0, -- 124,2,124,0,106,0,124,1,60,0,100,0,83,0,114,69, -- 0,0,0,41,1,114,47,1,0,0,41,3,114,142,0,0, -- 0,114,58,1,0,0,114,65,0,0,0,114,10,0,0,0, -+ 124,2,124,0,106,0,124,1,60,0,100,0,83,0,114,70, -+ 0,0,0,41,1,114,48,1,0,0,41,3,114,143,0,0, -+ 0,114,59,1,0,0,114,66,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,218,11,95,95,115,101, - 116,105,116,101,109,95,95,227,4,0,0,115,2,0,0,0, - 0,1,122,26,95,78,97,109,101,115,112,97,99,101,80,97, - 116,104,46,95,95,115,101,116,105,116,101,109,95,95,99,1, - 0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3, - 0,0,0,67,0,0,0,115,12,0,0,0,116,0,124,0, -- 160,1,161,0,131,1,83,0,114,69,0,0,0,41,2,114, -- 6,0,0,0,114,55,1,0,0,114,13,1,0,0,114,10, -+ 160,1,161,0,131,1,83,0,114,70,0,0,0,41,2,114, -+ 6,0,0,0,114,56,1,0,0,114,14,1,0,0,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,7,95, - 95,108,101,110,95,95,230,4,0,0,115,2,0,0,0,0, - 1,122,22,95,78,97,109,101,115,112,97,99,101,80,97,116, -@@ -2007,37 +2007,37 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 0,0,0,0,0,0,1,0,0,0,3,0,0,0,67,0, - 0,0,115,12,0,0,0,100,1,160,0,124,0,106,1,161, - 1,83,0,41,2,78,122,20,95,78,97,109,101,115,112,97, -- 99,101,80,97,116,104,40,123,33,114,125,41,41,2,114,88, -- 0,0,0,114,47,1,0,0,114,13,1,0,0,114,10,0, -+ 99,101,80,97,116,104,40,123,33,114,125,41,41,2,114,89, -+ 0,0,0,114,48,1,0,0,114,14,1,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,218,8,95,95, - 114,101,112,114,95,95,233,4,0,0,115,2,0,0,0,0, - 1,122,23,95,78,97,109,101,115,112,97,99,101,80,97,116, - 104,46,95,95,114,101,112,114,95,95,99,2,0,0,0,0, - 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,67, - 0,0,0,115,12,0,0,0,124,1,124,0,160,0,161,0, -- 118,0,83,0,114,69,0,0,0,114,57,1,0,0,169,2, -- 114,142,0,0,0,218,4,105,116,101,109,114,10,0,0,0, -+ 118,0,83,0,114,70,0,0,0,114,58,1,0,0,169,2, -+ 114,143,0,0,0,218,4,105,116,101,109,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,218,12,95,95,99,111, - 110,116,97,105,110,115,95,95,236,4,0,0,115,2,0,0, - 0,0,1,122,27,95,78,97,109,101,115,112,97,99,101,80, - 97,116,104,46,95,95,99,111,110,116,97,105,110,115,95,95, - 99,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0, - 0,3,0,0,0,67,0,0,0,115,16,0,0,0,124,0, -- 106,0,160,1,124,1,161,1,1,0,100,0,83,0,114,69, -- 0,0,0,41,2,114,47,1,0,0,114,61,0,0,0,114, -- 63,1,0,0,114,10,0,0,0,114,10,0,0,0,114,11, -- 0,0,0,114,61,0,0,0,239,4,0,0,115,2,0,0, -+ 106,0,160,1,124,1,161,1,1,0,100,0,83,0,114,70, -+ 0,0,0,41,2,114,48,1,0,0,114,62,0,0,0,114, -+ 64,1,0,0,114,10,0,0,0,114,10,0,0,0,114,11, -+ 0,0,0,114,62,0,0,0,239,4,0,0,115,2,0,0, - 0,0,1,122,21,95,78,97,109,101,115,112,97,99,101,80, -- 97,116,104,46,97,112,112,101,110,100,78,41,15,114,149,0, -- 0,0,114,148,0,0,0,114,150,0,0,0,114,151,0,0, -- 0,114,232,0,0,0,114,53,1,0,0,114,48,1,0,0, -- 114,55,1,0,0,114,56,1,0,0,114,59,1,0,0,114, -- 60,1,0,0,114,61,1,0,0,114,62,1,0,0,114,65, -- 1,0,0,114,61,0,0,0,114,10,0,0,0,114,10,0, -- 0,0,114,10,0,0,0,114,11,0,0,0,114,45,1,0, -+ 97,116,104,46,97,112,112,101,110,100,78,41,15,114,150,0, -+ 0,0,114,149,0,0,0,114,151,0,0,0,114,152,0,0, -+ 0,114,233,0,0,0,114,54,1,0,0,114,49,1,0,0, -+ 114,56,1,0,0,114,57,1,0,0,114,60,1,0,0,114, -+ 61,1,0,0,114,62,1,0,0,114,63,1,0,0,114,66, -+ 1,0,0,114,62,0,0,0,114,10,0,0,0,114,10,0, -+ 0,0,114,10,0,0,0,114,11,0,0,0,114,46,1,0, - 0,181,4,0,0,115,24,0,0,0,8,1,4,6,8,6, - 8,10,8,4,8,13,8,3,8,3,8,3,8,3,8,3, -- 8,3,114,45,1,0,0,99,0,0,0,0,0,0,0,0, -+ 8,3,114,46,1,0,0,99,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,3,0,0,0,64,0,0,0, - 115,80,0,0,0,101,0,90,1,100,0,90,2,100,1,100, - 2,132,0,90,3,101,4,100,3,100,4,132,0,131,1,90, -@@ -2048,9 +2048,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 97,99,101,76,111,97,100,101,114,99,4,0,0,0,0,0, - 0,0,0,0,0,0,4,0,0,0,4,0,0,0,67,0, - 0,0,115,18,0,0,0,116,0,124,1,124,2,124,3,131, -- 3,124,0,95,1,100,0,83,0,114,69,0,0,0,41,2, -- 114,45,1,0,0,114,47,1,0,0,114,51,1,0,0,114, + 0,0,115,108,0,0,0,101,0,90,1,100,0,90,2,100, + 1,90,3,100,2,90,4,100,3,100,4,132,0,90,5,100, +@@ -1914,15 +1914,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,0,0,124,1,124,0,95,0,124,2,124,0,95,1,116, + 2,124,0,160,3,161,0,131,1,124,0,95,4,124,0,106, + 5,124,0,95,6,124,3,124,0,95,7,100,0,83,0,114, +- 69,0,0,0,41,8,218,5,95,110,97,109,101,218,5,95, +- 112,97,116,104,114,135,0,0,0,218,16,95,103,101,116,95, ++ 70,0,0,0,41,8,218,5,95,110,97,109,101,218,5,95, ++ 112,97,116,104,114,136,0,0,0,218,16,95,103,101,116,95, + 112,97,114,101,110,116,95,112,97,116,104,218,17,95,108,97, + 115,116,95,112,97,114,101,110,116,95,112,97,116,104,218,6, + 95,101,112,111,99,104,218,11,95,108,97,115,116,95,101,112, + 111,99,104,218,12,95,112,97,116,104,95,102,105,110,100,101, +- 114,169,4,114,142,0,0,0,114,140,0,0,0,114,65,0, ++ 114,169,4,114,143,0,0,0,114,141,0,0,0,114,66,0, + 0,0,90,11,112,97,116,104,95,102,105,110,100,101,114,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,232, -+ 3,124,0,95,1,100,0,83,0,114,70,0,0,0,41,2, -+ 114,46,1,0,0,114,48,1,0,0,114,52,1,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,233, - 0,0,0,245,4,0,0,115,2,0,0,0,0,1,122,25, - 95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,114, - 46,95,95,105,110,105,116,95,95,99,2,0,0,0,0,0, -@@ -2065,47 +2065,47 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 32,116,104,101,32,106,111,98,32,105,116,115,101,108,102,46, - 10,10,32,32,32,32,32,32,32,32,122,25,60,109,111,100, - 117,108,101,32,123,33,114,125,32,40,110,97,109,101,115,112, -- 97,99,101,41,62,41,2,114,88,0,0,0,114,149,0,0, -- 0,41,2,114,216,0,0,0,114,239,0,0,0,114,10,0, -+ 97,99,101,41,62,41,2,114,89,0,0,0,114,150,0,0, -+ 0,41,2,114,217,0,0,0,114,240,0,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,218,11,109,111, - 100,117,108,101,95,114,101,112,114,248,4,0,0,115,2,0, - 0,0,0,7,122,28,95,78,97,109,101,115,112,97,99,101, - 76,111,97,100,101,114,46,109,111,100,117,108,101,95,114,101, - 112,114,99,2,0,0,0,0,0,0,0,0,0,0,0,2, - 0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0, -- 100,1,83,0,41,2,78,84,114,10,0,0,0,114,242,0, -+ 100,1,83,0,41,2,78,84,114,10,0,0,0,114,243,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,206,0,0,0,1,5,0,0,115,2,0,0,0,0, -+ 0,114,207,0,0,0,1,5,0,0,115,2,0,0,0,0, - 1,122,27,95,78,97,109,101,115,112,97,99,101,76,111,97, - 100,101,114,46,105,115,95,112,97,99,107,97,103,101,99,2, - 0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,1, - 0,0,0,67,0,0,0,115,4,0,0,0,100,1,83,0, -- 41,2,78,114,14,0,0,0,114,10,0,0,0,114,242,0, -+ 41,2,78,114,14,0,0,0,114,10,0,0,0,114,243,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,252,0,0,0,4,5,0,0,115,2,0,0,0,0, -+ 0,114,253,0,0,0,4,5,0,0,115,2,0,0,0,0, - 1,122,27,95,78,97,109,101,115,112,97,99,101,76,111,97, - 100,101,114,46,103,101,116,95,115,111,117,114,99,101,99,2, - 0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,6, - 0,0,0,67,0,0,0,115,16,0,0,0,116,0,100,1, - 100,2,100,3,100,4,100,5,141,4,83,0,41,6,78,114, -- 14,0,0,0,122,8,60,115,116,114,105,110,103,62,114,238, -- 0,0,0,84,41,1,114,254,0,0,0,41,1,114,255,0, -- 0,0,114,242,0,0,0,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,114,236,0,0,0,7,5,0,0,115, -+ 14,0,0,0,122,8,60,115,116,114,105,110,103,62,114,239, -+ 0,0,0,84,41,1,114,255,0,0,0,41,1,114,0,1, -+ 0,0,114,243,0,0,0,114,10,0,0,0,114,10,0,0, -+ 0,114,11,0,0,0,114,237,0,0,0,7,5,0,0,115, - 2,0,0,0,0,1,122,25,95,78,97,109,101,115,112,97, - 99,101,76,111,97,100,101,114,46,103,101,116,95,99,111,100, - 101,99,2,0,0,0,0,0,0,0,0,0,0,0,2,0, - 0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,100, -- 1,83,0,114,233,0,0,0,114,10,0,0,0,114,234,0, -+ 1,83,0,114,234,0,0,0,114,10,0,0,0,114,235,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,235,0,0,0,10,5,0,0,115,2,0,0,0,0, -+ 0,114,236,0,0,0,10,5,0,0,115,2,0,0,0,0, - 1,122,30,95,78,97,109,101,115,112,97,99,101,76,111,97, - 100,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108, - 101,99,2,0,0,0,0,0,0,0,0,0,0,0,2,0, - 0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,100, -- 0,83,0,114,69,0,0,0,114,10,0,0,0,114,20,1, -+ 0,83,0,114,70,0,0,0,114,10,0,0,0,114,21,1, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,240,0,0,0,13,5,0,0,115,2,0,0,0,0, -+ 0,114,241,0,0,0,13,5,0,0,115,2,0,0,0,0, - 1,122,28,95,78,97,109,101,115,112,97,99,101,76,111,97, - 100,101,114,46,101,120,101,99,95,109,111,100,117,108,101,99, - 2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0, -@@ -2120,20 +2120,20 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 97,100,46,10,10,32,32,32,32,32,32,32,32,122,38,110, - 97,109,101,115,112,97,99,101,32,109,111,100,117,108,101,32, - 108,111,97,100,101,100,32,119,105,116,104,32,112,97,116,104, -- 32,123,33,114,125,41,4,114,158,0,0,0,114,173,0,0, -- 0,114,47,1,0,0,114,241,0,0,0,114,242,0,0,0, -+ 32,123,33,114,125,41,4,114,159,0,0,0,114,174,0,0, -+ 0,114,48,1,0,0,114,242,0,0,0,114,243,0,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, -- 243,0,0,0,16,5,0,0,115,8,0,0,0,0,7,6, -+ 244,0,0,0,16,5,0,0,115,8,0,0,0,0,7,6, - 1,4,255,4,2,122,28,95,78,97,109,101,115,112,97,99, - 101,76,111,97,100,101,114,46,108,111,97,100,95,109,111,100, -- 117,108,101,78,41,12,114,149,0,0,0,114,148,0,0,0, -- 114,150,0,0,0,114,232,0,0,0,114,230,0,0,0,114, -- 67,1,0,0,114,206,0,0,0,114,252,0,0,0,114,236, -- 0,0,0,114,235,0,0,0,114,240,0,0,0,114,243,0, -+ 117,108,101,78,41,12,114,150,0,0,0,114,149,0,0,0, -+ 114,151,0,0,0,114,233,0,0,0,114,231,0,0,0,114, -+ 68,1,0,0,114,207,0,0,0,114,253,0,0,0,114,237, -+ 0,0,0,114,236,0,0,0,114,241,0,0,0,114,244,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,114,66,1,0,0,244,4,0,0,115, -+ 0,114,11,0,0,0,114,67,1,0,0,244,4,0,0,115, - 18,0,0,0,8,1,8,3,2,1,10,8,8,3,8,3, -- 8,3,8,3,8,3,114,66,1,0,0,99,0,0,0,0, -+ 8,3,8,3,8,3,114,67,1,0,0,99,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0, - 64,0,0,0,115,118,0,0,0,101,0,90,1,100,0,90, - 2,100,1,90,3,101,4,100,2,100,3,132,0,131,1,90, -@@ -2165,10 +2165,10 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 110,118,97,108,105,100,97,116,101,95,99,97,99,104,101,115, - 41,6,218,4,108,105,115,116,114,21,0,0,0,218,19,112, - 97,116,104,95,105,109,112,111,114,116,101,114,95,99,97,99, -- 104,101,218,5,105,116,101,109,115,114,152,0,0,0,114,69, -- 1,0,0,41,3,114,216,0,0,0,114,140,0,0,0,218, -+ 104,101,218,5,105,116,101,109,115,114,153,0,0,0,114,70, -+ 1,0,0,41,3,114,217,0,0,0,114,141,0,0,0,218, - 6,102,105,110,100,101,114,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,114,69,1,0,0,34,5,0,0,115, -+ 0,114,11,0,0,0,114,70,1,0,0,34,5,0,0,115, - 10,0,0,0,0,4,22,1,8,1,10,1,10,1,122,28, - 80,97,116,104,70,105,110,100,101,114,46,105,110,118,97,108, - 105,100,97,116,101,95,99,97,99,104,101,115,99,2,0,0, -@@ -2184,9 +2184,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 101,114,32,102,111,114,32,39,112,97,116,104,39,46,78,122, - 23,115,121,115,46,112,97,116,104,95,104,111,111,107,115,32, - 105,115,32,101,109,112,116,121,41,6,114,21,0,0,0,218, -- 10,112,97,116,104,95,104,111,111,107,115,114,98,0,0,0, -- 114,99,0,0,0,114,162,0,0,0,114,141,0,0,0,41, -- 3,114,216,0,0,0,114,65,0,0,0,90,4,104,111,111, -+ 10,112,97,116,104,95,104,111,111,107,115,114,99,0,0,0, -+ 114,100,0,0,0,114,163,0,0,0,114,142,0,0,0,41, -+ 3,114,217,0,0,0,114,66,0,0,0,90,4,104,111,111, - 107,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, - 218,11,95,112,97,116,104,95,104,111,111,107,115,44,5,0, - 0,115,16,0,0,0,0,3,16,1,12,1,10,1,2,1, -@@ -2214,10 +2214,10 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 101,114,32,105,115,32,97,118,97,105,108,97,98,108,101,44, - 32,115,116,111,114,101,32,78,111,110,101,46,10,10,32,32, - 32,32,32,32,32,32,114,14,0,0,0,78,41,7,114,24, -- 0,0,0,114,81,0,0,0,114,26,1,0,0,114,21,0, -- 0,0,114,71,1,0,0,218,8,75,101,121,69,114,114,111, -- 114,114,75,1,0,0,41,3,114,216,0,0,0,114,65,0, -- 0,0,114,73,1,0,0,114,10,0,0,0,114,10,0,0, -+ 0,0,0,114,82,0,0,0,114,27,1,0,0,114,21,0, -+ 0,0,114,72,1,0,0,218,8,75,101,121,69,114,114,111, -+ 114,114,76,1,0,0,41,3,114,217,0,0,0,114,66,0, -+ 0,0,114,74,1,0,0,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,218,20,95,112,97,116,104,95,105,109, - 112,111,114,116,101,114,95,99,97,99,104,101,57,5,0,0, - 115,22,0,0,0,0,8,8,1,2,1,12,1,12,3,8, -@@ -2231,11 +2231,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 125,4,124,3,100,0,117,1,114,60,116,3,160,4,124,1, - 124,3,161,2,83,0,116,3,160,5,124,1,100,0,161,2, - 125,5,124,4,124,5,95,6,124,5,83,0,41,2,78,114, -- 161,0,0,0,41,7,114,152,0,0,0,114,161,0,0,0, -- 114,229,0,0,0,114,158,0,0,0,114,224,0,0,0,114, -- 207,0,0,0,114,202,0,0,0,41,6,114,216,0,0,0, -- 114,163,0,0,0,114,73,1,0,0,114,164,0,0,0,114, -- 165,0,0,0,114,210,0,0,0,114,10,0,0,0,114,10, -+ 162,0,0,0,41,7,114,153,0,0,0,114,162,0,0,0, -+ 114,230,0,0,0,114,159,0,0,0,114,225,0,0,0,114, -+ 208,0,0,0,114,203,0,0,0,41,6,114,217,0,0,0, -+ 114,164,0,0,0,114,74,1,0,0,114,165,0,0,0,114, -+ 166,0,0,0,114,211,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,218,16,95,108,101,103,97,99, - 121,95,103,101,116,95,115,112,101,99,79,5,0,0,115,18, - 0,0,0,0,4,10,1,16,2,10,1,4,1,8,1,12, -@@ -2257,17 +2257,17 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 116,104,101,32,108,111,97,100,101,114,32,111,114,32,110,97, - 109,101,115,112,97,99,101,95,112,97,116,104,32,102,111,114, - 32,116,104,105,115,32,109,111,100,117,108,101,47,112,97,99, -- 107,97,103,101,32,110,97,109,101,46,78,114,226,0,0,0, -+ 107,97,103,101,32,110,97,109,101,46,78,114,227,0,0,0, - 122,19,115,112,101,99,32,109,105,115,115,105,110,103,32,108, -- 111,97,100,101,114,41,13,114,185,0,0,0,114,108,0,0, -- 0,218,5,98,121,116,101,115,114,77,1,0,0,114,152,0, -- 0,0,114,226,0,0,0,114,78,1,0,0,114,164,0,0, -- 0,114,202,0,0,0,114,141,0,0,0,114,191,0,0,0, -- 114,158,0,0,0,114,207,0,0,0,41,9,114,216,0,0, -- 0,114,163,0,0,0,114,65,0,0,0,114,225,0,0,0, -+ 111,97,100,101,114,41,13,114,186,0,0,0,114,109,0,0, -+ 0,218,5,98,121,116,101,115,114,78,1,0,0,114,153,0, -+ 0,0,114,227,0,0,0,114,79,1,0,0,114,165,0,0, -+ 0,114,203,0,0,0,114,142,0,0,0,114,192,0,0,0, -+ 114,159,0,0,0,114,208,0,0,0,41,9,114,217,0,0, -+ 0,114,164,0,0,0,114,66,0,0,0,114,226,0,0,0, - 218,14,110,97,109,101,115,112,97,99,101,95,112,97,116,104, -- 90,5,101,110,116,114,121,114,73,1,0,0,114,210,0,0, -- 0,114,165,0,0,0,114,10,0,0,0,114,10,0,0,0, -+ 90,5,101,110,116,114,121,114,74,1,0,0,114,211,0,0, -+ 0,114,166,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,11,0,0,0,218,9,95,103,101,116,95,115,112,101,99, - 94,5,0,0,115,40,0,0,0,0,5,4,1,8,1,14, - 1,2,1,10,1,8,1,10,1,14,2,12,1,8,1,2, -@@ -2291,12 +2291,12 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 111,111,107,115,32,97,110,100,32,115,121,115,46,112,97,116, - 104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101, - 46,10,32,32,32,32,32,32,32,32,78,41,7,114,21,0, -- 0,0,114,65,0,0,0,114,81,1,0,0,114,164,0,0, -- 0,114,202,0,0,0,114,205,0,0,0,114,45,1,0,0, -- 41,6,114,216,0,0,0,114,163,0,0,0,114,65,0,0, -- 0,114,225,0,0,0,114,210,0,0,0,114,80,1,0,0, -+ 0,0,114,66,0,0,0,114,82,1,0,0,114,165,0,0, -+ 0,114,203,0,0,0,114,206,0,0,0,114,46,1,0,0, -+ 41,6,114,217,0,0,0,114,164,0,0,0,114,66,0,0, -+ 0,114,226,0,0,0,114,211,0,0,0,114,81,1,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, -- 226,0,0,0,126,5,0,0,115,26,0,0,0,0,6,8, -+ 227,0,0,0,126,5,0,0,115,26,0,0,0,0,6,8, - 1,6,1,14,1,8,1,4,1,10,1,6,1,4,3,6, - 1,16,1,4,2,6,2,122,20,80,97,116,104,70,105,110, - 100,101,114,46,102,105,110,100,95,115,112,101,99,99,3,0, -@@ -2314,9 +2314,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 116,104,111,100,32,105,115,32,100,101,112,114,101,99,97,116, - 101,100,46,32,32,85,115,101,32,102,105,110,100,95,115,112, - 101,99,40,41,32,105,110,115,116,101,97,100,46,10,10,32, -- 32,32,32,32,32,32,32,78,114,227,0,0,0,114,228,0, -+ 32,32,32,32,32,32,32,78,114,228,0,0,0,114,229,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,229,0,0,0,150,5,0,0,115,8,0,0,0,0, -+ 0,114,230,0,0,0,150,5,0,0,115,8,0,0,0,0, - 8,12,1,8,1,4,1,122,22,80,97,116,104,70,105,110, - 100,101,114,46,102,105,110,100,95,109,111,100,117,108,101,99, - 1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0, -@@ -2344,23 +2344,23 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 114,0,0,0,0,41,1,218,18,77,101,116,97,100,97,116, - 97,80,97,116,104,70,105,110,100,101,114,41,3,90,18,105, - 109,112,111,114,116,108,105,98,46,109,101,116,97,100,97,116, -- 97,114,82,1,0,0,218,18,102,105,110,100,95,100,105,115, -- 116,114,105,98,117,116,105,111,110,115,41,4,114,216,0,0, -- 0,114,143,0,0,0,114,144,0,0,0,114,82,1,0,0, -+ 97,114,83,1,0,0,218,18,102,105,110,100,95,100,105,115, -+ 116,114,105,98,117,116,105,111,110,115,41,4,114,217,0,0, -+ 0,114,144,0,0,0,114,145,0,0,0,114,83,1,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, -- 83,1,0,0,163,5,0,0,115,4,0,0,0,0,10,12, -+ 84,1,0,0,163,5,0,0,115,4,0,0,0,0,10,12, - 1,122,29,80,97,116,104,70,105,110,100,101,114,46,102,105, - 110,100,95,100,105,115,116,114,105,98,117,116,105,111,110,115, -- 41,1,78,41,2,78,78,41,1,78,41,13,114,149,0,0, -- 0,114,148,0,0,0,114,150,0,0,0,114,151,0,0,0, -- 114,230,0,0,0,114,69,1,0,0,114,75,1,0,0,114, -- 77,1,0,0,114,78,1,0,0,114,81,1,0,0,114,226, -- 0,0,0,114,229,0,0,0,114,83,1,0,0,114,10,0, -+ 41,1,78,41,2,78,78,41,1,78,41,13,114,150,0,0, -+ 0,114,149,0,0,0,114,151,0,0,0,114,152,0,0,0, -+ 114,231,0,0,0,114,70,1,0,0,114,76,1,0,0,114, -+ 78,1,0,0,114,79,1,0,0,114,82,1,0,0,114,227, -+ 0,0,0,114,230,0,0,0,114,84,1,0,0,114,10,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,68,1,0,0,30,5,0,0,115,34,0,0,0,8, -+ 0,114,69,1,0,0,30,5,0,0,115,34,0,0,0,8, - 2,4,2,2,1,10,9,2,1,10,12,2,1,10,21,2, - 1,10,14,2,1,12,31,2,1,12,23,2,1,12,12,2, -- 1,114,68,1,0,0,99,0,0,0,0,0,0,0,0,0, -+ 1,114,69,1,0,0,99,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,3,0,0,0,64,0,0,0,115, - 90,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3, - 100,2,100,3,132,0,90,4,100,4,100,5,132,0,90,5, -@@ -2401,23 +2401,23 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 110,105,122,101,115,46,99,1,0,0,0,0,0,0,0,0, - 0,0,0,2,0,0,0,3,0,0,0,51,0,0,0,115, - 22,0,0,0,124,0,93,14,125,1,124,1,136,0,102,2, -- 86,0,1,0,113,2,100,0,83,0,114,69,0,0,0,114, -- 10,0,0,0,114,40,1,0,0,169,1,114,164,0,0,0, -+ 86,0,1,0,113,2,100,0,83,0,114,70,0,0,0,114, -+ 10,0,0,0,114,41,1,0,0,169,1,114,165,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,12,0,0,0,192, - 5,0,0,114,13,0,0,0,122,38,70,105,108,101,70,105, - 110,100,101,114,46,95,95,105,110,105,116,95,95,46,60,108, - 111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,62, -- 114,96,0,0,0,114,129,0,0,0,78,41,11,114,191,0, -- 0,0,218,8,95,108,111,97,100,101,114,115,114,65,0,0, -- 0,114,85,0,0,0,114,67,0,0,0,114,24,0,0,0, -- 114,81,0,0,0,218,11,95,112,97,116,104,95,109,116,105, -+ 114,97,0,0,0,114,130,0,0,0,78,41,11,114,192,0, -+ 0,0,218,8,95,108,111,97,100,101,114,115,114,66,0,0, -+ 0,114,86,0,0,0,114,68,0,0,0,114,24,0,0,0, -+ 114,82,0,0,0,218,11,95,112,97,116,104,95,109,116,105, - 109,101,218,3,115,101,116,218,11,95,112,97,116,104,95,99, - 97,99,104,101,218,19,95,114,101,108,97,120,101,100,95,112, -- 97,116,104,95,99,97,99,104,101,41,5,114,142,0,0,0, -- 114,65,0,0,0,218,14,108,111,97,100,101,114,95,100,101, -- 116,97,105,108,115,90,7,108,111,97,100,101,114,115,114,212, -- 0,0,0,114,10,0,0,0,114,85,1,0,0,114,11,0, -- 0,0,114,232,0,0,0,186,5,0,0,115,20,0,0,0, -+ 97,116,104,95,99,97,99,104,101,41,5,114,143,0,0,0, -+ 114,66,0,0,0,218,14,108,111,97,100,101,114,95,100,101, -+ 116,97,105,108,115,90,7,108,111,97,100,101,114,115,114,213, -+ 0,0,0,114,10,0,0,0,114,86,1,0,0,114,11,0, -+ 0,0,114,233,0,0,0,186,5,0,0,115,20,0,0,0, - 0,4,4,1,12,1,26,1,6,2,10,1,10,1,18,1, - 6,1,8,1,122,19,70,105,108,101,70,105,110,100,101,114, - 46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0, -@@ -2425,9 +2425,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 0,0,115,10,0,0,0,100,1,124,0,95,0,100,2,83, - 0,41,3,122,31,73,110,118,97,108,105,100,97,116,101,32, - 116,104,101,32,100,105,114,101,99,116,111,114,121,32,109,116, -- 105,109,101,46,114,129,0,0,0,78,41,1,114,87,1,0, -- 0,114,13,1,0,0,114,10,0,0,0,114,10,0,0,0, -- 114,11,0,0,0,114,69,1,0,0,202,5,0,0,115,2, -+ 105,109,101,46,114,130,0,0,0,78,41,1,114,88,1,0, -+ 0,114,14,1,0,0,114,10,0,0,0,114,10,0,0,0, -+ 114,11,0,0,0,114,70,1,0,0,202,5,0,0,115,2, - 0,0,0,0,2,122,28,70,105,108,101,70,105,110,100,101, - 114,46,105,110,118,97,108,105,100,97,116,101,95,99,97,99, - 104,101,115,99,2,0,0,0,0,0,0,0,0,0,0,0, -@@ -2447,21 +2447,21 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,46, - 32,32,85,115,101,32,102,105,110,100,95,115,112,101,99,40, - 41,32,105,110,115,116,101,97,100,46,10,10,32,32,32,32, -- 32,32,32,32,78,41,3,114,226,0,0,0,114,164,0,0, -- 0,114,202,0,0,0,41,3,114,142,0,0,0,114,163,0, -- 0,0,114,210,0,0,0,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,114,161,0,0,0,208,5,0,0,115, -+ 32,32,32,32,78,41,3,114,227,0,0,0,114,165,0,0, -+ 0,114,203,0,0,0,41,3,114,143,0,0,0,114,164,0, -+ 0,0,114,211,0,0,0,114,10,0,0,0,114,10,0,0, -+ 0,114,11,0,0,0,114,162,0,0,0,208,5,0,0,115, - 8,0,0,0,0,7,10,1,8,1,8,1,122,22,70,105, - 108,101,70,105,110,100,101,114,46,102,105,110,100,95,108,111, - 97,100,101,114,99,6,0,0,0,0,0,0,0,0,0,0, - 0,7,0,0,0,6,0,0,0,67,0,0,0,115,26,0, - 0,0,124,1,124,2,124,3,131,2,125,6,116,0,124,2, - 124,3,124,6,124,4,100,1,141,4,83,0,41,2,78,114, -- 201,0,0,0,41,1,114,213,0,0,0,41,7,114,142,0, -- 0,0,114,211,0,0,0,114,163,0,0,0,114,65,0,0, -- 0,90,4,115,109,115,108,114,225,0,0,0,114,164,0,0, -+ 202,0,0,0,41,1,114,214,0,0,0,41,7,114,143,0, -+ 0,0,114,212,0,0,0,114,164,0,0,0,114,66,0,0, -+ 0,90,4,115,109,115,108,114,226,0,0,0,114,165,0,0, + 0,0,0,192,4,0,0,115,10,0,0,0,0,1,6,1, + 6,1,14,1,8,1,122,23,95,78,97,109,101,115,112,97, + 99,101,80,97,116,104,46,95,95,105,110,105,116,95,95,99, +@@ -1934,10 +1934,10 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 32,116,117,112,108,101,32,111,102,32,40,112,97,114,101,110, + 116,45,109,111,100,117,108,101,45,110,97,109,101,44,32,112, + 97,114,101,110,116,45,112,97,116,104,45,97,116,116,114,45, +- 110,97,109,101,41,114,96,0,0,0,114,14,0,0,0,41, +- 2,114,21,0,0,0,114,65,0,0,0,90,8,95,95,112, +- 97,116,104,95,95,41,2,114,46,1,0,0,114,103,0,0, +- 0,41,4,114,142,0,0,0,114,38,1,0,0,218,3,100, ++ 110,97,109,101,41,114,97,0,0,0,114,14,0,0,0,41, ++ 2,114,21,0,0,0,114,66,0,0,0,90,8,95,95,112, ++ 97,116,104,95,95,41,2,114,47,1,0,0,114,104,0,0, ++ 0,41,4,114,143,0,0,0,114,39,1,0,0,218,3,100, + 111,116,90,2,109,101,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,23,95,102,105,110,100,95,112,97,114, + 101,110,116,95,112,97,116,104,95,110,97,109,101,115,199,4, +@@ -1948,12 +1948,12 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,0,0,0,3,0,0,0,3,0,0,0,67,0,0,0, + 115,28,0,0,0,124,0,160,0,161,0,92,2,125,1,125, + 2,116,1,116,2,106,3,124,1,25,0,124,2,131,2,83, +- 0,114,69,0,0,0,41,4,114,55,1,0,0,114,154,0, ++ 0,114,70,0,0,0,41,4,114,56,1,0,0,114,155,0, + 0,0,114,21,0,0,0,218,7,109,111,100,117,108,101,115, +- 41,3,114,142,0,0,0,90,18,112,97,114,101,110,116,95, ++ 41,3,114,143,0,0,0,90,18,112,97,114,101,110,116,95, + 109,111,100,117,108,101,95,110,97,109,101,90,14,112,97,116, + 104,95,97,116,116,114,95,110,97,109,101,114,10,0,0,0, +- 114,10,0,0,0,114,11,0,0,0,114,48,1,0,0,209, ++ 114,10,0,0,0,114,11,0,0,0,114,49,1,0,0,209, + 4,0,0,115,4,0,0,0,0,1,12,1,122,31,95,78, + 97,109,101,115,112,97,99,101,80,97,116,104,46,95,103,101, + 116,95,112,97,114,101,110,116,95,112,97,116,104,99,1,0, +@@ -1965,11 +1965,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 1,114,80,124,2,106,7,100,0,117,0,114,80,124,2,106, + 8,114,80,124,2,106,8,124,0,95,9,124,1,124,0,95, + 2,124,0,106,3,124,0,95,4,124,0,106,9,83,0,114, +- 69,0,0,0,41,10,114,135,0,0,0,114,48,1,0,0, +- 114,49,1,0,0,114,50,1,0,0,114,51,1,0,0,114, +- 52,1,0,0,114,46,1,0,0,114,164,0,0,0,114,202, +- 0,0,0,114,47,1,0,0,41,3,114,142,0,0,0,90, +- 11,112,97,114,101,110,116,95,112,97,116,104,114,210,0,0, ++ 70,0,0,0,41,10,114,136,0,0,0,114,49,1,0,0, ++ 114,50,1,0,0,114,51,1,0,0,114,52,1,0,0,114, ++ 53,1,0,0,114,47,1,0,0,114,165,0,0,0,114,203, ++ 0,0,0,114,48,1,0,0,41,3,114,143,0,0,0,90, ++ 11,112,97,114,101,110,116,95,112,97,116,104,114,211,0,0, 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, -- 114,81,1,0,0,220,5,0,0,115,8,0,0,0,0,1, -+ 114,82,1,0,0,220,5,0,0,115,8,0,0,0,0,1, - 10,1,8,1,2,255,122,20,70,105,108,101,70,105,110,100, - 101,114,46,95,103,101,116,95,115,112,101,99,78,99,3,0, - 0,0,0,0,0,0,0,0,0,0,14,0,0,0,9,0, -@@ -2496,28 +2496,28 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 32,32,32,82,101,116,117,114,110,115,32,116,104,101,32,109, - 97,116,99,104,105,110,103,32,115,112,101,99,44,32,111,114, - 32,78,111,110,101,32,105,102,32,110,111,116,32,102,111,117, -- 110,100,46,10,32,32,32,32,32,32,32,32,70,114,96,0, -- 0,0,114,45,0,0,0,114,129,0,0,0,114,232,0,0, -+ 110,100,46,10,32,32,32,32,32,32,32,32,70,114,97,0, -+ 0,0,114,46,0,0,0,114,130,0,0,0,114,233,0,0, - 0,78,122,9,116,114,121,105,110,103,32,123,125,41,1,90, - 9,118,101,114,98,111,115,105,116,121,122,25,112,111,115,115, - 105,98,108,101,32,110,97,109,101,115,112,97,99,101,32,102, -- 111,114,32,123,125,41,23,114,103,0,0,0,114,75,0,0, -- 0,114,65,0,0,0,114,24,0,0,0,114,81,0,0,0, -- 114,33,1,0,0,114,76,0,0,0,114,87,1,0,0,218, -- 11,95,102,105,108,108,95,99,97,99,104,101,114,27,0,0, -- 0,114,90,1,0,0,114,130,0,0,0,114,89,1,0,0, -- 114,67,0,0,0,114,86,1,0,0,114,80,0,0,0,114, -- 81,1,0,0,114,82,0,0,0,114,110,0,0,0,114,158, -- 0,0,0,114,173,0,0,0,114,207,0,0,0,114,202,0, -- 0,0,41,14,114,142,0,0,0,114,163,0,0,0,114,225, -+ 111,114,32,123,125,41,23,114,104,0,0,0,114,76,0,0, -+ 0,114,66,0,0,0,114,24,0,0,0,114,82,0,0,0, -+ 114,34,1,0,0,114,77,0,0,0,114,88,1,0,0,218, -+ 11,95,102,105,108,108,95,99,97,99,104,101,114,28,0,0, -+ 0,114,91,1,0,0,114,131,0,0,0,114,90,1,0,0, -+ 114,68,0,0,0,114,87,1,0,0,114,81,0,0,0,114, -+ 82,1,0,0,114,83,0,0,0,114,111,0,0,0,114,159, -+ 0,0,0,114,174,0,0,0,114,208,0,0,0,114,203,0, -+ 0,0,41,14,114,143,0,0,0,114,164,0,0,0,114,226, - 0,0,0,90,12,105,115,95,110,97,109,101,115,112,97,99, -- 101,90,11,116,97,105,108,95,109,111,100,117,108,101,114,193, -+ 101,90,11,116,97,105,108,95,109,111,100,117,108,101,114,194, - 0,0,0,90,5,99,97,99,104,101,90,12,99,97,99,104, - 101,95,109,111,100,117,108,101,90,9,98,97,115,101,95,112, -- 97,116,104,114,41,1,0,0,114,211,0,0,0,90,13,105, -+ 97,116,104,114,42,1,0,0,114,212,0,0,0,90,13,105, - 110,105,116,95,102,105,108,101,110,97,109,101,90,9,102,117, -- 108,108,95,112,97,116,104,114,210,0,0,0,114,10,0,0, -- 0,114,10,0,0,0,114,11,0,0,0,114,226,0,0,0, -+ 108,108,95,112,97,116,104,114,211,0,0,0,114,10,0,0, -+ 0,114,10,0,0,0,114,11,0,0,0,114,227,0,0,0, - 225,5,0,0,115,78,0,0,0,0,5,4,1,14,1,2, - 1,24,1,12,1,10,1,10,1,8,1,6,2,6,1,6, - 1,10,2,6,1,4,2,8,1,12,1,14,1,8,1,10, -@@ -2543,29 +2543,29 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 101,110,116,105,97,108,32,109,111,100,117,108,101,115,32,97, - 110,100,32,112,97,99,107,97,103,101,115,32,102,111,114,32, - 116,104,105,115,32,100,105,114,101,99,116,111,114,121,46,114, -- 20,0,0,0,114,96,0,0,0,114,87,0,0,0,99,1, -+ 20,0,0,0,114,97,0,0,0,114,88,0,0,0,99,1, - 0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,4, - 0,0,0,83,0,0,0,115,20,0,0,0,104,0,124,0, - 93,12,125,1,124,1,160,0,161,0,146,2,113,4,83,0, -- 114,10,0,0,0,41,1,114,130,0,0,0,41,2,114,8, -+ 114,10,0,0,0,41,1,114,131,0,0,0,41,2,114,8, - 0,0,0,90,2,102,110,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,114,19,0,0,0,49,6,0,0,114, - 13,0,0,0,122,41,70,105,108,101,70,105,110,100,101,114, - 46,95,102,105,108,108,95,99,97,99,104,101,46,60,108,111, - 99,97,108,115,62,46,60,115,101,116,99,111,109,112,62,78, -- 41,18,114,65,0,0,0,114,24,0,0,0,114,30,1,0, -- 0,114,81,0,0,0,114,26,1,0,0,218,15,80,101,114, -+ 41,18,114,66,0,0,0,114,24,0,0,0,114,31,1,0, -+ 0,114,82,0,0,0,114,27,1,0,0,218,15,80,101,114, - 109,105,115,115,105,111,110,69,114,114,111,114,218,18,78,111, - 116,65,68,105,114,101,99,116,111,114,121,69,114,114,111,114, -- 114,21,0,0,0,114,28,0,0,0,114,29,0,0,0,114, -- 88,1,0,0,114,89,1,0,0,114,125,0,0,0,114,88, -- 0,0,0,114,130,0,0,0,218,3,97,100,100,114,30,0, -- 0,0,114,90,1,0,0,41,9,114,142,0,0,0,114,65, -- 0,0,0,114,31,1,0,0,90,21,108,111,119,101,114,95, -+ 114,21,0,0,0,114,29,0,0,0,114,30,0,0,0,114, -+ 89,1,0,0,114,90,1,0,0,114,126,0,0,0,114,89, -+ 0,0,0,114,131,0,0,0,218,3,97,100,100,114,31,0, -+ 0,0,114,91,1,0,0,41,9,114,143,0,0,0,114,66, -+ 0,0,0,114,32,1,0,0,90,21,108,111,119,101,114,95, - 115,117,102,102,105,120,95,99,111,110,116,101,110,116,115,114, -- 64,1,0,0,114,140,0,0,0,114,52,1,0,0,114,41, -+ 65,1,0,0,114,141,0,0,0,114,53,1,0,0,114,42, - 1,0,0,90,8,110,101,119,95,110,97,109,101,114,10,0, -- 0,0,114,10,0,0,0,114,11,0,0,0,114,92,1,0, -+ 0,0,114,10,0,0,0,114,11,0,0,0,114,93,1,0, - 0,20,6,0,0,115,34,0,0,0,0,2,6,1,2,1, - 22,1,18,3,10,3,12,1,12,7,6,1,8,1,16,1, - 4,1,18,2,4,1,12,1,6,1,12,1,122,22,70,105, -@@ -2600,17 +2600,17 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 104,105,110,101,114,121,46,70,105,108,101,70,105,110,100,101, - 114,46,122,30,111,110,108,121,32,100,105,114,101,99,116,111, - 114,105,101,115,32,97,114,101,32,115,117,112,112,111,114,116, -- 101,100,114,71,0,0,0,41,2,114,82,0,0,0,114,141, -- 0,0,0,114,71,0,0,0,169,2,114,216,0,0,0,114, -- 91,1,0,0,114,10,0,0,0,114,11,0,0,0,218,24, -+ 101,100,114,72,0,0,0,41,2,114,83,0,0,0,114,142, -+ 0,0,0,114,72,0,0,0,169,2,114,217,0,0,0,114, -+ 92,1,0,0,114,10,0,0,0,114,11,0,0,0,218,24, - 112,97,116,104,95,104,111,111,107,95,102,111,114,95,70,105, - 108,101,70,105,110,100,101,114,61,6,0,0,115,6,0,0, - 0,0,2,8,1,12,1,122,54,70,105,108,101,70,105,110, - 100,101,114,46,112,97,116,104,95,104,111,111,107,46,60,108, - 111,99,97,108,115,62,46,112,97,116,104,95,104,111,111,107, - 95,102,111,114,95,70,105,108,101,70,105,110,100,101,114,114, -- 10,0,0,0,41,3,114,216,0,0,0,114,91,1,0,0, -- 114,97,1,0,0,114,10,0,0,0,114,96,1,0,0,114, -+ 10,0,0,0,41,3,114,217,0,0,0,114,92,1,0,0, -+ 114,98,1,0,0,114,10,0,0,0,114,97,1,0,0,114, - 11,0,0,0,218,9,112,97,116,104,95,104,111,111,107,51, - 6,0,0,115,4,0,0,0,0,10,14,6,122,20,70,105, - 108,101,70,105,110,100,101,114,46,112,97,116,104,95,104,111, -@@ -2618,19 +2618,19 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 218,12,95,114,101,99,97,108,99,117,108,97,116,101,213,4, + 0,0,115,18,0,0,0,0,2,12,1,22,1,14,3,18, +@@ -1978,15 +1978,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 99,117,108,97,116,101,99,1,0,0,0,0,0,0,0,0, + 0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,115, + 12,0,0,0,116,0,124,0,160,1,161,0,131,1,83,0, +- 114,69,0,0,0,41,2,114,29,1,0,0,114,57,1,0, +- 0,114,13,1,0,0,114,10,0,0,0,114,10,0,0,0, ++ 114,70,0,0,0,41,2,114,30,1,0,0,114,58,1,0, ++ 0,114,14,1,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,8,95,95,105,116,101,114,95,95,227, + 4,0,0,115,2,0,0,0,0,1,122,23,95,78,97,109, + 101,115,112,97,99,101,80,97,116,104,46,95,95,105,116,101, + 114,95,95,99,2,0,0,0,0,0,0,0,0,0,0,0, + 2,0,0,0,2,0,0,0,67,0,0,0,115,12,0,0, +- 0,124,0,160,0,161,0,124,1,25,0,83,0,114,69,0, +- 0,0,169,1,114,57,1,0,0,41,2,114,142,0,0,0, ++ 0,124,0,160,0,161,0,124,1,25,0,83,0,114,70,0, ++ 0,0,169,1,114,58,1,0,0,41,2,114,143,0,0,0, + 218,5,105,110,100,101,120,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,218,11,95,95,103,101,116,105,116,101, + 109,95,95,230,4,0,0,115,2,0,0,0,0,1,122,26, +@@ -1994,8 +1994,8 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 95,103,101,116,105,116,101,109,95,95,99,3,0,0,0,0, + 0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67, + 0,0,0,115,14,0,0,0,124,2,124,0,106,0,124,1, +- 60,0,100,0,83,0,114,69,0,0,0,41,1,114,47,1, +- 0,0,41,3,114,142,0,0,0,114,60,1,0,0,114,65, ++ 60,0,100,0,83,0,114,70,0,0,0,41,1,114,48,1, ++ 0,0,41,3,114,143,0,0,0,114,61,1,0,0,114,66, + 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, + 0,0,218,11,95,95,115,101,116,105,116,101,109,95,95,233, + 4,0,0,115,2,0,0,0,0,1,122,26,95,78,97,109, +@@ -2003,8 +2003,8 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 105,116,101,109,95,95,99,1,0,0,0,0,0,0,0,0, + 0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,115, + 12,0,0,0,116,0,124,0,160,1,161,0,131,1,83,0, +- 114,69,0,0,0,41,2,114,6,0,0,0,114,57,1,0, +- 0,114,13,1,0,0,114,10,0,0,0,114,10,0,0,0, ++ 114,70,0,0,0,41,2,114,6,0,0,0,114,58,1,0, ++ 0,114,14,1,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,7,95,95,108,101,110,95,95,236,4, + 0,0,115,2,0,0,0,0,1,122,22,95,78,97,109,101, + 115,112,97,99,101,80,97,116,104,46,95,95,108,101,110,95, +@@ -2012,15 +2012,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,0,3,0,0,0,67,0,0,0,115,12,0,0,0,100, + 1,160,0,124,0,106,1,161,1,83,0,41,2,78,122,20, + 95,78,97,109,101,115,112,97,99,101,80,97,116,104,40,123, +- 33,114,125,41,41,2,114,88,0,0,0,114,47,1,0,0, +- 114,13,1,0,0,114,10,0,0,0,114,10,0,0,0,114, ++ 33,114,125,41,41,2,114,89,0,0,0,114,48,1,0,0, ++ 114,14,1,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,218,8,95,95,114,101,112,114,95,95,239,4, + 0,0,115,2,0,0,0,0,1,122,23,95,78,97,109,101, + 115,112,97,99,101,80,97,116,104,46,95,95,114,101,112,114, + 95,95,99,2,0,0,0,0,0,0,0,0,0,0,0,2, 0,0,0,3,0,0,0,67,0,0,0,115,12,0,0,0, - 100,1,160,0,124,0,106,1,161,1,83,0,41,2,78,122, - 16,70,105,108,101,70,105,110,100,101,114,40,123,33,114,125, -- 41,41,2,114,88,0,0,0,114,65,0,0,0,114,13,1, -+ 41,41,2,114,89,0,0,0,114,66,0,0,0,114,14,1, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,62,1,0,0,69,6,0,0,115,2,0,0,0,0, -+ 0,114,63,1,0,0,69,6,0,0,115,2,0,0,0,0, - 1,122,19,70,105,108,101,70,105,110,100,101,114,46,95,95, -- 114,101,112,114,95,95,41,1,78,41,15,114,149,0,0,0, -- 114,148,0,0,0,114,150,0,0,0,114,151,0,0,0,114, -- 232,0,0,0,114,69,1,0,0,114,167,0,0,0,114,229, -- 0,0,0,114,161,0,0,0,114,81,1,0,0,114,226,0, -- 0,0,114,92,1,0,0,114,230,0,0,0,114,98,1,0, -- 0,114,62,1,0,0,114,10,0,0,0,114,10,0,0,0, -- 114,10,0,0,0,114,11,0,0,0,114,84,1,0,0,177, -+ 114,101,112,114,95,95,41,1,78,41,15,114,150,0,0,0, -+ 114,149,0,0,0,114,151,0,0,0,114,152,0,0,0,114, -+ 233,0,0,0,114,70,1,0,0,114,168,0,0,0,114,230, -+ 0,0,0,114,162,0,0,0,114,82,1,0,0,114,227,0, -+ 0,0,114,93,1,0,0,114,231,0,0,0,114,99,1,0, -+ 0,114,63,1,0,0,114,10,0,0,0,114,10,0,0,0, -+ 114,10,0,0,0,114,11,0,0,0,114,85,1,0,0,177, - 5,0,0,115,22,0,0,0,8,2,4,7,8,16,8,4, -- 4,2,8,12,8,5,10,51,8,31,2,1,10,17,114,84, -+ 4,2,8,12,8,5,10,51,8,31,2,1,10,17,114,85, - 1,0,0,99,4,0,0,0,0,0,0,0,0,0,0,0, - 6,0,0,0,8,0,0,0,67,0,0,0,115,144,0,0, - 0,124,0,160,0,100,1,161,1,125,4,124,0,160,0,100, -@@ -2643,19 +2643,19 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 3,124,0,100,5,60,0,87,0,110,18,4,0,116,5,121, - 138,1,0,1,0,1,0,89,0,110,2,48,0,100,0,83, - 0,41,6,78,218,10,95,95,108,111,97,100,101,114,95,95, -- 218,8,95,95,115,112,101,99,95,95,114,85,1,0,0,90, -+ 218,8,95,95,115,112,101,99,95,95,114,86,1,0,0,90, - 8,95,95,102,105,108,101,95,95,90,10,95,95,99,97,99, -- 104,101,100,95,95,41,6,218,3,103,101,116,114,164,0,0, -- 0,114,39,1,0,0,114,32,1,0,0,114,213,0,0,0, -+ 104,101,100,95,95,41,6,218,3,103,101,116,114,165,0,0, -+ 0,114,40,1,0,0,114,33,1,0,0,114,214,0,0,0, - 218,9,69,120,99,101,112,116,105,111,110,41,6,90,2,110, -- 115,114,140,0,0,0,90,8,112,97,116,104,110,97,109,101, -- 90,9,99,112,97,116,104,110,97,109,101,114,164,0,0,0, +- 124,1,124,0,160,0,161,0,118,0,83,0,114,69,0,0, +- 0,114,59,1,0,0,169,2,114,142,0,0,0,218,4,105, ++ 124,1,124,0,160,0,161,0,118,0,83,0,114,70,0,0, ++ 0,114,60,1,0,0,169,2,114,143,0,0,0,218,4,105, + 116,101,109,114,10,0,0,0,114,10,0,0,0,114,11,0, + 0,0,218,12,95,95,99,111,110,116,97,105,110,115,95,95, + 242,4,0,0,115,2,0,0,0,0,1,122,27,95,78,97, +@@ -2028,21 +2028,21 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 110,116,97,105,110,115,95,95,99,2,0,0,0,0,0,0, + 0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0, + 0,115,16,0,0,0,124,0,106,0,160,1,124,1,161,1, +- 1,0,100,0,83,0,114,69,0,0,0,41,2,114,47,1, +- 0,0,114,61,0,0,0,114,65,1,0,0,114,10,0,0, +- 0,114,10,0,0,0,114,11,0,0,0,114,61,0,0,0, ++ 1,0,100,0,83,0,114,70,0,0,0,41,2,114,48,1, ++ 0,0,114,62,0,0,0,114,66,1,0,0,114,10,0,0, ++ 0,114,10,0,0,0,114,11,0,0,0,114,62,0,0,0, + 245,4,0,0,115,2,0,0,0,0,1,122,21,95,78,97, + 109,101,115,112,97,99,101,80,97,116,104,46,97,112,112,101, +- 110,100,78,41,16,114,149,0,0,0,114,148,0,0,0,114, +- 150,0,0,0,114,151,0,0,0,114,50,1,0,0,114,232, +- 0,0,0,114,55,1,0,0,114,48,1,0,0,114,57,1, +- 0,0,114,58,1,0,0,114,61,1,0,0,114,62,1,0, +- 0,114,63,1,0,0,114,64,1,0,0,114,67,1,0,0, +- 114,61,0,0,0,114,10,0,0,0,114,10,0,0,0,114, +- 10,0,0,0,114,11,0,0,0,114,45,1,0,0,181,4, ++ 110,100,78,41,16,114,150,0,0,0,114,149,0,0,0,114, ++ 151,0,0,0,114,152,0,0,0,114,51,1,0,0,114,233, ++ 0,0,0,114,56,1,0,0,114,49,1,0,0,114,58,1, ++ 0,0,114,59,1,0,0,114,62,1,0,0,114,63,1,0, ++ 0,114,64,1,0,0,114,65,1,0,0,114,68,1,0,0, ++ 114,62,0,0,0,114,10,0,0,0,114,10,0,0,0,114, ++ 10,0,0,0,114,11,0,0,0,114,46,1,0,0,181,4, + 0,0,115,26,0,0,0,8,1,4,8,4,2,8,7,8, + 10,8,4,8,14,8,3,8,3,8,3,8,3,8,3,8, +- 3,114,45,1,0,0,99,0,0,0,0,0,0,0,0,0, ++ 3,114,46,1,0,0,99,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,3,0,0,0,64,0,0,0,115, + 80,0,0,0,101,0,90,1,100,0,90,2,100,1,100,2, + 132,0,90,3,101,4,100,3,100,4,132,0,131,1,90,5, +@@ -2053,9 +2053,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 99,101,76,111,97,100,101,114,99,4,0,0,0,0,0,0, + 0,0,0,0,0,4,0,0,0,4,0,0,0,67,0,0, + 0,115,18,0,0,0,116,0,124,1,124,2,124,3,131,3, +- 124,0,95,1,100,0,83,0,114,69,0,0,0,41,2,114, +- 45,1,0,0,114,47,1,0,0,114,53,1,0,0,114,10, +- 0,0,0,114,10,0,0,0,114,11,0,0,0,114,232,0, ++ 124,0,95,1,100,0,83,0,114,70,0,0,0,41,2,114, ++ 46,1,0,0,114,48,1,0,0,114,54,1,0,0,114,10, ++ 0,0,0,114,10,0,0,0,114,11,0,0,0,114,233,0, + 0,0,251,4,0,0,115,2,0,0,0,0,1,122,25,95, + 78,97,109,101,115,112,97,99,101,76,111,97,100,101,114,46, + 95,95,105,110,105,116,95,95,99,2,0,0,0,0,0,0, +@@ -2070,47 +2070,47 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 116,104,101,32,106,111,98,32,105,116,115,101,108,102,46,10, + 10,32,32,32,32,32,32,32,32,122,25,60,109,111,100,117, + 108,101,32,123,33,114,125,32,40,110,97,109,101,115,112,97, +- 99,101,41,62,41,2,114,88,0,0,0,114,149,0,0,0, +- 41,2,114,216,0,0,0,114,239,0,0,0,114,10,0,0, ++ 99,101,41,62,41,2,114,89,0,0,0,114,150,0,0,0, ++ 41,2,114,217,0,0,0,114,240,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,218,11,109,111,100, + 117,108,101,95,114,101,112,114,254,4,0,0,115,2,0,0, + 0,0,7,122,28,95,78,97,109,101,115,112,97,99,101,76, + 111,97,100,101,114,46,109,111,100,117,108,101,95,114,101,112, + 114,99,2,0,0,0,0,0,0,0,0,0,0,0,2,0, + 0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,100, +- 1,83,0,41,2,78,84,114,10,0,0,0,114,242,0,0, ++ 1,83,0,41,2,78,84,114,10,0,0,0,114,243,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, +- 114,206,0,0,0,7,5,0,0,115,2,0,0,0,0,1, ++ 114,207,0,0,0,7,5,0,0,115,2,0,0,0,0,1, + 122,27,95,78,97,109,101,115,112,97,99,101,76,111,97,100, + 101,114,46,105,115,95,112,97,99,107,97,103,101,99,2,0, + 0,0,0,0,0,0,0,0,0,0,2,0,0,0,1,0, + 0,0,67,0,0,0,115,4,0,0,0,100,1,83,0,41, +- 2,78,114,14,0,0,0,114,10,0,0,0,114,242,0,0, ++ 2,78,114,14,0,0,0,114,10,0,0,0,114,243,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, +- 114,252,0,0,0,10,5,0,0,115,2,0,0,0,0,1, ++ 114,253,0,0,0,10,5,0,0,115,2,0,0,0,0,1, + 122,27,95,78,97,109,101,115,112,97,99,101,76,111,97,100, + 101,114,46,103,101,116,95,115,111,117,114,99,101,99,2,0, + 0,0,0,0,0,0,0,0,0,0,2,0,0,0,6,0, + 0,0,67,0,0,0,115,16,0,0,0,116,0,100,1,100, + 2,100,3,100,4,100,5,141,4,83,0,41,6,78,114,14, +- 0,0,0,122,8,60,115,116,114,105,110,103,62,114,238,0, +- 0,0,84,41,1,114,254,0,0,0,41,1,114,255,0,0, +- 0,114,242,0,0,0,114,10,0,0,0,114,10,0,0,0, +- 114,11,0,0,0,114,236,0,0,0,13,5,0,0,115,2, ++ 0,0,0,122,8,60,115,116,114,105,110,103,62,114,239,0, ++ 0,0,84,41,1,114,255,0,0,0,41,1,114,0,1,0, ++ 0,114,243,0,0,0,114,10,0,0,0,114,10,0,0,0, ++ 114,11,0,0,0,114,237,0,0,0,13,5,0,0,115,2, + 0,0,0,0,1,122,25,95,78,97,109,101,115,112,97,99, + 101,76,111,97,100,101,114,46,103,101,116,95,99,111,100,101, + 99,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0, + 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,1, +- 83,0,114,233,0,0,0,114,10,0,0,0,114,234,0,0, ++ 83,0,114,234,0,0,0,114,10,0,0,0,114,235,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, +- 114,235,0,0,0,16,5,0,0,115,2,0,0,0,0,1, ++ 114,236,0,0,0,16,5,0,0,115,2,0,0,0,0,1, + 122,30,95,78,97,109,101,115,112,97,99,101,76,111,97,100, + 101,114,46,99,114,101,97,116,101,95,109,111,100,117,108,101, + 99,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0, + 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,0, +- 83,0,114,69,0,0,0,114,10,0,0,0,114,20,1,0, ++ 83,0,114,70,0,0,0,114,10,0,0,0,114,21,1,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, +- 114,240,0,0,0,19,5,0,0,115,2,0,0,0,0,1, ++ 114,241,0,0,0,19,5,0,0,115,2,0,0,0,0,1, + 122,28,95,78,97,109,101,115,112,97,99,101,76,111,97,100, + 101,114,46,101,120,101,99,95,109,111,100,117,108,101,99,2, + 0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,4, +@@ -2125,20 +2125,20 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 100,46,10,10,32,32,32,32,32,32,32,32,122,38,110,97, + 109,101,115,112,97,99,101,32,109,111,100,117,108,101,32,108, + 111,97,100,101,100,32,119,105,116,104,32,112,97,116,104,32, +- 123,33,114,125,41,4,114,158,0,0,0,114,173,0,0,0, +- 114,47,1,0,0,114,241,0,0,0,114,242,0,0,0,114, +- 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,243, ++ 123,33,114,125,41,4,114,159,0,0,0,114,174,0,0,0, ++ 114,48,1,0,0,114,242,0,0,0,114,243,0,0,0,114, ++ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,244, + 0,0,0,22,5,0,0,115,8,0,0,0,0,7,6,1, + 4,255,4,2,122,28,95,78,97,109,101,115,112,97,99,101, + 76,111,97,100,101,114,46,108,111,97,100,95,109,111,100,117, +- 108,101,78,41,12,114,149,0,0,0,114,148,0,0,0,114, +- 150,0,0,0,114,232,0,0,0,114,230,0,0,0,114,69, +- 1,0,0,114,206,0,0,0,114,252,0,0,0,114,236,0, +- 0,0,114,235,0,0,0,114,240,0,0,0,114,243,0,0, ++ 108,101,78,41,12,114,150,0,0,0,114,149,0,0,0,114, ++ 151,0,0,0,114,233,0,0,0,114,231,0,0,0,114,70, ++ 1,0,0,114,207,0,0,0,114,253,0,0,0,114,237,0, ++ 0,0,114,236,0,0,0,114,241,0,0,0,114,244,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,0, +- 114,11,0,0,0,114,68,1,0,0,250,4,0,0,115,18, ++ 114,11,0,0,0,114,69,1,0,0,250,4,0,0,115,18, + 0,0,0,8,1,8,3,2,1,10,8,8,3,8,3,8, +- 3,8,3,8,3,114,68,1,0,0,99,0,0,0,0,0, ++ 3,8,3,8,3,114,69,1,0,0,99,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,64, + 0,0,0,115,118,0,0,0,101,0,90,1,100,0,90,2, + 100,1,90,3,101,4,100,2,100,3,132,0,131,1,90,5, +@@ -2171,11 +2171,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 108,105,100,97,116,101,95,99,97,99,104,101,115,114,4,0, + 0,0,41,8,218,4,108,105,115,116,114,21,0,0,0,218, + 19,112,97,116,104,95,105,109,112,111,114,116,101,114,95,99, +- 97,99,104,101,218,5,105,116,101,109,115,114,152,0,0,0, +- 114,71,1,0,0,114,45,1,0,0,114,50,1,0,0,41, +- 3,114,216,0,0,0,114,140,0,0,0,218,6,102,105,110, ++ 97,99,104,101,218,5,105,116,101,109,115,114,153,0,0,0, ++ 114,72,1,0,0,114,46,1,0,0,114,51,1,0,0,41, ++ 3,114,217,0,0,0,114,141,0,0,0,218,6,102,105,110, + 100,101,114,114,10,0,0,0,114,10,0,0,0,114,11,0, +- 0,0,114,71,1,0,0,40,5,0,0,115,12,0,0,0, ++ 0,0,114,72,1,0,0,40,5,0,0,115,12,0,0,0, + 0,4,22,1,8,1,10,1,10,1,10,3,122,28,80,97, + 116,104,70,105,110,100,101,114,46,105,110,118,97,108,105,100, + 97,116,101,95,99,97,99,104,101,115,99,2,0,0,0,0, +@@ -2191,9 +2191,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 32,102,111,114,32,39,112,97,116,104,39,46,78,122,23,115, + 121,115,46,112,97,116,104,95,104,111,111,107,115,32,105,115, + 32,101,109,112,116,121,41,6,114,21,0,0,0,218,10,112, +- 97,116,104,95,104,111,111,107,115,114,98,0,0,0,114,99, +- 0,0,0,114,162,0,0,0,114,141,0,0,0,41,3,114, +- 216,0,0,0,114,65,0,0,0,90,4,104,111,111,107,114, ++ 97,116,104,95,104,111,111,107,115,114,99,0,0,0,114,100, ++ 0,0,0,114,163,0,0,0,114,142,0,0,0,41,3,114, ++ 217,0,0,0,114,66,0,0,0,90,4,104,111,111,107,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,11, + 95,112,97,116,104,95,104,111,111,107,115,53,5,0,0,115, + 16,0,0,0,0,3,16,1,12,1,10,1,2,1,14,1, +@@ -2221,10 +2221,10 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 32,105,115,32,97,118,97,105,108,97,98,108,101,44,32,115, + 116,111,114,101,32,78,111,110,101,46,10,10,32,32,32,32, + 32,32,32,32,114,14,0,0,0,78,41,7,114,24,0,0, +- 0,114,81,0,0,0,114,26,1,0,0,114,21,0,0,0, +- 114,73,1,0,0,218,8,75,101,121,69,114,114,111,114,114, +- 77,1,0,0,41,3,114,216,0,0,0,114,65,0,0,0, +- 114,75,1,0,0,114,10,0,0,0,114,10,0,0,0,114, ++ 0,114,82,0,0,0,114,27,1,0,0,114,21,0,0,0, ++ 114,74,1,0,0,218,8,75,101,121,69,114,114,111,114,114, ++ 78,1,0,0,41,3,114,217,0,0,0,114,66,0,0,0, ++ 114,76,1,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,218,20,95,112,97,116,104,95,105,109,112,111, + 114,116,101,114,95,99,97,99,104,101,66,5,0,0,115,22, + 0,0,0,0,8,8,1,2,1,12,1,12,3,8,1,2, +@@ -2237,12 +2237,12 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 110,14,124,2,160,2,124,1,161,1,125,3,103,0,125,4, + 124,3,100,0,117,1,114,60,116,3,160,4,124,1,124,3, + 161,2,83,0,116,3,160,5,124,1,100,0,161,2,125,5, +- 124,4,124,5,95,6,124,5,83,0,41,2,78,114,161,0, +- 0,0,41,7,114,152,0,0,0,114,161,0,0,0,114,229, +- 0,0,0,114,158,0,0,0,114,224,0,0,0,114,207,0, +- 0,0,114,202,0,0,0,41,6,114,216,0,0,0,114,163, +- 0,0,0,114,75,1,0,0,114,164,0,0,0,114,165,0, +- 0,0,114,210,0,0,0,114,10,0,0,0,114,10,0,0, ++ 124,4,124,5,95,6,124,5,83,0,41,2,78,114,162,0, ++ 0,0,41,7,114,153,0,0,0,114,162,0,0,0,114,230, ++ 0,0,0,114,159,0,0,0,114,225,0,0,0,114,208,0, ++ 0,0,114,203,0,0,0,41,6,114,217,0,0,0,114,164, ++ 0,0,0,114,76,1,0,0,114,165,0,0,0,114,166,0, ++ 0,0,114,211,0,0,0,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,218,16,95,108,101,103,97,99,121,95, + 103,101,116,95,115,112,101,99,88,5,0,0,115,18,0,0, + 0,0,4,10,1,16,2,10,1,4,1,8,1,12,1,12, +@@ -2264,17 +2264,17 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 101,32,108,111,97,100,101,114,32,111,114,32,110,97,109,101, + 115,112,97,99,101,95,112,97,116,104,32,102,111,114,32,116, + 104,105,115,32,109,111,100,117,108,101,47,112,97,99,107,97, +- 103,101,32,110,97,109,101,46,78,114,226,0,0,0,122,19, ++ 103,101,32,110,97,109,101,46,78,114,227,0,0,0,122,19, + 115,112,101,99,32,109,105,115,115,105,110,103,32,108,111,97, +- 100,101,114,41,13,114,185,0,0,0,114,108,0,0,0,218, +- 5,98,121,116,101,115,114,79,1,0,0,114,152,0,0,0, +- 114,226,0,0,0,114,80,1,0,0,114,164,0,0,0,114, +- 202,0,0,0,114,141,0,0,0,114,191,0,0,0,114,158, +- 0,0,0,114,207,0,0,0,41,9,114,216,0,0,0,114, +- 163,0,0,0,114,65,0,0,0,114,225,0,0,0,218,14, ++ 100,101,114,41,13,114,186,0,0,0,114,109,0,0,0,218, ++ 5,98,121,116,101,115,114,80,1,0,0,114,153,0,0,0, ++ 114,227,0,0,0,114,81,1,0,0,114,165,0,0,0,114, ++ 203,0,0,0,114,142,0,0,0,114,192,0,0,0,114,159, ++ 0,0,0,114,208,0,0,0,41,9,114,217,0,0,0,114, ++ 164,0,0,0,114,66,0,0,0,114,226,0,0,0,218,14, + 110,97,109,101,115,112,97,99,101,95,112,97,116,104,90,5, +- 101,110,116,114,121,114,75,1,0,0,114,210,0,0,0,114, +- 165,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, ++ 101,110,116,114,121,114,76,1,0,0,114,211,0,0,0,114, ++ 166,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,218,9,95,103,101,116,95,115,112,101,99,103,5, + 0,0,115,40,0,0,0,0,5,4,1,8,1,14,1,2, + 1,10,1,8,1,10,1,14,2,12,1,8,1,2,1,10, +@@ -2298,11 +2298,11 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 107,115,32,97,110,100,32,115,121,115,46,112,97,116,104,95, + 105,109,112,111,114,116,101,114,95,99,97,99,104,101,46,10, + 32,32,32,32,32,32,32,32,78,41,7,114,21,0,0,0, +- 114,65,0,0,0,114,83,1,0,0,114,164,0,0,0,114, +- 202,0,0,0,114,205,0,0,0,114,45,1,0,0,41,6, +- 114,216,0,0,0,114,163,0,0,0,114,65,0,0,0,114, +- 225,0,0,0,114,210,0,0,0,114,82,1,0,0,114,10, +- 0,0,0,114,10,0,0,0,114,11,0,0,0,114,226,0, ++ 114,66,0,0,0,114,84,1,0,0,114,165,0,0,0,114, ++ 203,0,0,0,114,206,0,0,0,114,46,1,0,0,41,6, ++ 114,217,0,0,0,114,164,0,0,0,114,66,0,0,0,114, ++ 226,0,0,0,114,211,0,0,0,114,83,1,0,0,114,10, ++ 0,0,0,114,10,0,0,0,114,11,0,0,0,114,227,0, + 0,0,135,5,0,0,115,26,0,0,0,0,6,8,1,6, + 1,14,1,8,1,4,1,10,1,6,1,4,3,6,1,16, + 1,4,2,6,2,122,20,80,97,116,104,70,105,110,100,101, +@@ -2321,9 +2321,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,100, + 46,32,32,85,115,101,32,102,105,110,100,95,115,112,101,99, + 40,41,32,105,110,115,116,101,97,100,46,10,10,32,32,32, +- 32,32,32,32,32,78,114,227,0,0,0,114,228,0,0,0, ++ 32,32,32,32,32,78,114,228,0,0,0,114,229,0,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, +- 229,0,0,0,159,5,0,0,115,8,0,0,0,0,8,12, ++ 230,0,0,0,159,5,0,0,115,8,0,0,0,0,8,12, + 1,8,1,4,1,122,22,80,97,116,104,70,105,110,100,101, + 114,46,102,105,110,100,95,109,111,100,117,108,101,99,1,0, + 0,0,0,0,0,0,0,0,0,0,4,0,0,0,4,0, +@@ -2351,23 +2351,23 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,0,0,41,1,218,18,77,101,116,97,100,97,116,97,80, + 97,116,104,70,105,110,100,101,114,41,3,90,18,105,109,112, + 111,114,116,108,105,98,46,109,101,116,97,100,97,116,97,114, +- 84,1,0,0,218,18,102,105,110,100,95,100,105,115,116,114, +- 105,98,117,116,105,111,110,115,41,4,114,216,0,0,0,114, +- 143,0,0,0,114,144,0,0,0,114,84,1,0,0,114,10, +- 0,0,0,114,10,0,0,0,114,11,0,0,0,114,85,1, ++ 85,1,0,0,218,18,102,105,110,100,95,100,105,115,116,114, ++ 105,98,117,116,105,111,110,115,41,4,114,217,0,0,0,114, ++ 144,0,0,0,114,145,0,0,0,114,85,1,0,0,114,10, ++ 0,0,0,114,10,0,0,0,114,11,0,0,0,114,86,1, + 0,0,172,5,0,0,115,4,0,0,0,0,10,12,1,122, + 29,80,97,116,104,70,105,110,100,101,114,46,102,105,110,100, + 95,100,105,115,116,114,105,98,117,116,105,111,110,115,41,1, +- 78,41,2,78,78,41,1,78,41,13,114,149,0,0,0,114, +- 148,0,0,0,114,150,0,0,0,114,151,0,0,0,114,230, +- 0,0,0,114,71,1,0,0,114,77,1,0,0,114,79,1, +- 0,0,114,80,1,0,0,114,83,1,0,0,114,226,0,0, +- 0,114,229,0,0,0,114,85,1,0,0,114,10,0,0,0, ++ 78,41,2,78,78,41,1,78,41,13,114,150,0,0,0,114, ++ 149,0,0,0,114,151,0,0,0,114,152,0,0,0,114,231, ++ 0,0,0,114,72,1,0,0,114,78,1,0,0,114,80,1, ++ 0,0,114,81,1,0,0,114,84,1,0,0,114,227,0,0, ++ 0,114,230,0,0,0,114,86,1,0,0,114,10,0,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, +- 70,1,0,0,36,5,0,0,115,34,0,0,0,8,2,4, ++ 71,1,0,0,36,5,0,0,115,34,0,0,0,8,2,4, + 2,2,1,10,12,2,1,10,12,2,1,10,21,2,1,10, + 14,2,1,12,31,2,1,12,23,2,1,12,12,2,1,114, +- 70,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0, ++ 71,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,3,0,0,0,64,0,0,0,115,90,0, + 0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2, + 100,3,132,0,90,4,100,4,100,5,132,0,90,5,101,6, +@@ -2408,23 +2408,23 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 122,101,115,46,99,1,0,0,0,0,0,0,0,0,0,0, + 0,2,0,0,0,3,0,0,0,51,0,0,0,115,22,0, + 0,0,124,0,93,14,125,1,124,1,136,0,102,2,86,0, +- 1,0,113,2,100,0,83,0,114,69,0,0,0,114,10,0, +- 0,0,114,40,1,0,0,169,1,114,164,0,0,0,114,10, ++ 1,0,113,2,100,0,83,0,114,70,0,0,0,114,10,0, ++ 0,0,114,41,1,0,0,169,1,114,165,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,12,0,0,0,201,5,0, + 0,114,13,0,0,0,122,38,70,105,108,101,70,105,110,100, + 101,114,46,95,95,105,110,105,116,95,95,46,60,108,111,99, +- 97,108,115,62,46,60,103,101,110,101,120,112,114,62,114,96, +- 0,0,0,114,129,0,0,0,78,41,11,114,191,0,0,0, +- 218,8,95,108,111,97,100,101,114,115,114,65,0,0,0,114, +- 85,0,0,0,114,67,0,0,0,114,24,0,0,0,114,81, ++ 97,108,115,62,46,60,103,101,110,101,120,112,114,62,114,97, ++ 0,0,0,114,130,0,0,0,78,41,11,114,192,0,0,0, ++ 218,8,95,108,111,97,100,101,114,115,114,66,0,0,0,114, ++ 86,0,0,0,114,68,0,0,0,114,24,0,0,0,114,82, + 0,0,0,218,11,95,112,97,116,104,95,109,116,105,109,101, + 218,3,115,101,116,218,11,95,112,97,116,104,95,99,97,99, + 104,101,218,19,95,114,101,108,97,120,101,100,95,112,97,116, +- 104,95,99,97,99,104,101,41,5,114,142,0,0,0,114,65, ++ 104,95,99,97,99,104,101,41,5,114,143,0,0,0,114,66, + 0,0,0,218,14,108,111,97,100,101,114,95,100,101,116,97, +- 105,108,115,90,7,108,111,97,100,101,114,115,114,212,0,0, +- 0,114,10,0,0,0,114,87,1,0,0,114,11,0,0,0, +- 114,232,0,0,0,195,5,0,0,115,20,0,0,0,0,4, ++ 105,108,115,90,7,108,111,97,100,101,114,115,114,213,0,0, ++ 0,114,10,0,0,0,114,88,1,0,0,114,11,0,0,0, ++ 114,233,0,0,0,195,5,0,0,115,20,0,0,0,0,4, + 4,1,12,1,26,1,6,2,10,1,10,1,18,1,6,1, + 8,1,122,19,70,105,108,101,70,105,110,100,101,114,46,95, + 95,105,110,105,116,95,95,99,1,0,0,0,0,0,0,0, +@@ -2432,9 +2432,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 115,10,0,0,0,100,1,124,0,95,0,100,2,83,0,41, + 3,122,31,73,110,118,97,108,105,100,97,116,101,32,116,104, + 101,32,100,105,114,101,99,116,111,114,121,32,109,116,105,109, +- 101,46,114,129,0,0,0,78,41,1,114,89,1,0,0,114, +- 13,1,0,0,114,10,0,0,0,114,10,0,0,0,114,11, +- 0,0,0,114,71,1,0,0,211,5,0,0,115,2,0,0, ++ 101,46,114,130,0,0,0,78,41,1,114,90,1,0,0,114, ++ 14,1,0,0,114,10,0,0,0,114,10,0,0,0,114,11, ++ 0,0,0,114,72,1,0,0,211,5,0,0,115,2,0,0, + 0,0,2,122,28,70,105,108,101,70,105,110,100,101,114,46, + 105,110,118,97,108,105,100,97,116,101,95,99,97,99,104,101, + 115,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0, +@@ -2454,20 +2454,20 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 105,115,32,100,101,112,114,101,99,97,116,101,100,46,32,32, + 85,115,101,32,102,105,110,100,95,115,112,101,99,40,41,32, + 105,110,115,116,101,97,100,46,10,10,32,32,32,32,32,32, +- 32,32,78,41,3,114,226,0,0,0,114,164,0,0,0,114, +- 202,0,0,0,41,3,114,142,0,0,0,114,163,0,0,0, - 114,210,0,0,0,114,10,0,0,0,114,10,0,0,0,114, -+ 115,114,141,0,0,0,90,8,112,97,116,104,110,97,109,101, -+ 90,9,99,112,97,116,104,110,97,109,101,114,165,0,0,0, +- 11,0,0,0,114,161,0,0,0,217,5,0,0,115,8,0, ++ 32,32,78,41,3,114,227,0,0,0,114,165,0,0,0,114, ++ 203,0,0,0,41,3,114,143,0,0,0,114,164,0,0,0, + 114,211,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,14,95,102,105,120,95,117,112,95,109,111, - 100,117,108,101,75,6,0,0,115,34,0,0,0,0,2,10, - 1,10,1,4,1,4,1,8,1,8,1,12,2,10,1,4, - 1,14,1,2,1,8,1,8,1,8,1,12,1,12,2,114, -- 103,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0, -+ 104,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0, - 0,3,0,0,0,3,0,0,0,67,0,0,0,115,38,0, - 0,0,116,0,116,1,160,2,161,0,102,2,125,0,116,3, - 116,4,102,2,125,1,116,5,116,6,102,2,125,2,124,0, -@@ -2665,17 +2665,17 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 108,111,97,100,101,114,115,46,10,10,32,32,32,32,69,97, - 99,104,32,105,116,101,109,32,105,115,32,97,32,116,117,112, - 108,101,32,40,108,111,97,100,101,114,44,32,115,117,102,102, -- 105,120,101,115,41,46,10,32,32,32,32,41,7,114,19,1, -- 0,0,114,187,0,0,0,218,18,101,120,116,101,110,115,105, -- 111,110,95,115,117,102,102,105,120,101,115,114,32,1,0,0, -- 114,126,0,0,0,114,39,1,0,0,114,112,0,0,0,41, -+ 105,120,101,115,41,46,10,32,32,32,32,41,7,114,20,1, -+ 0,0,114,188,0,0,0,218,18,101,120,116,101,110,115,105, -+ 111,110,95,115,117,102,102,105,120,101,115,114,33,1,0,0, -+ 114,127,0,0,0,114,40,1,0,0,114,113,0,0,0,41, - 3,90,10,101,120,116,101,110,115,105,111,110,115,90,6,115, - 111,117,114,99,101,90,8,98,121,116,101,99,111,100,101,114, -- 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,208, -+ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,209, - 0,0,0,98,6,0,0,115,8,0,0,0,0,5,12,1, -- 8,1,8,1,114,208,0,0,0,99,1,0,0,0,0,0, -+ 8,1,8,1,114,209,0,0,0,99,1,0,0,0,0,0, - 0,0,0,0,0,0,10,0,0,0,9,0,0,0,67,0, -- 0,0,115,132,1,0,0,124,0,97,0,116,0,106,1,97, -+ 0,0,115,164,1,0,0,124,0,97,0,116,0,106,1,97, - 1,116,0,106,2,97,2,116,1,106,3,116,4,25,0,125, - 1,100,1,100,2,103,1,102,2,100,3,100,4,100,2,103, - 2,102,2,102,2,125,2,124,2,68,0,93,108,92,2,125, -@@ -2686,20 +2686,22 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 6,124,3,161,1,125,6,87,0,1,0,113,170,87,0,113, - 52,4,0,116,7,121,158,1,0,1,0,1,0,89,0,113, - 52,89,0,113,52,48,0,113,52,116,7,100,8,131,1,130, -- 1,116,8,124,1,100,9,124,6,131,3,1,0,116,8,124, -- 1,100,10,124,5,131,3,1,0,116,8,124,1,100,11,100, -- 12,160,9,124,4,161,1,131,3,1,0,116,8,124,1,100, -- 13,100,14,100,15,132,0,124,4,68,0,131,1,131,3,1, -- 0,103,0,100,16,162,1,125,7,124,3,100,3,107,2,144, -- 1,114,6,124,7,160,10,100,17,161,1,1,0,124,7,68, -+ 1,100,9,124,6,106,8,118,0,114,202,124,4,100,10,100, -+ 10,100,11,133,3,25,0,125,4,124,4,100,7,25,0,125, -+ 5,116,9,124,1,100,12,124,6,131,3,1,0,116,9,124, -+ 1,100,13,124,5,131,3,1,0,116,9,124,1,100,14,100, -+ 15,160,10,124,4,161,1,131,3,1,0,116,9,124,1,100, -+ 16,100,17,100,18,132,0,124,4,68,0,131,1,131,3,1, -+ 0,103,0,100,19,162,1,125,7,124,3,100,3,107,2,144, -+ 1,114,38,124,7,160,11,100,20,161,1,1,0,124,7,68, - 0,93,52,125,8,124,8,116,1,106,3,118,1,144,1,114, -- 38,116,0,160,6,124,8,161,1,125,9,110,10,116,1,106, -- 3,124,8,25,0,125,9,116,8,124,1,124,8,124,9,131, -- 3,1,0,144,1,113,10,116,8,124,1,100,18,116,11,131, -- 0,131,3,1,0,116,12,160,13,116,2,160,14,161,0,161, -- 1,1,0,124,3,100,3,107,2,144,1,114,128,116,15,160, -- 10,100,19,161,1,1,0,100,20,116,12,118,0,144,1,114, -- 128,100,21,116,16,95,17,100,22,83,0,41,23,122,205,83, -+ 70,116,0,160,6,124,8,161,1,125,9,110,10,116,1,106, -+ 3,124,8,25,0,125,9,116,9,124,1,124,8,124,9,131, -+ 3,1,0,144,1,113,42,116,9,124,1,100,21,116,12,131, -+ 0,131,3,1,0,116,13,160,14,116,2,160,15,161,0,161, -+ 1,1,0,124,3,100,3,107,2,144,1,114,160,116,16,160, -+ 11,100,22,161,1,1,0,100,23,116,13,118,0,144,1,114, -+ 160,100,24,116,17,95,18,100,10,83,0,41,25,122,205,83, - 101,116,117,112,32,116,104,101,32,112,97,116,104,45,98,97, - 115,101,100,32,105,109,112,111,114,116,101,114,115,32,102,111, - 114,32,105,109,112,111,114,116,108,105,98,32,98,121,32,105, -@@ -2724,102 +2726,103 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { - 111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,62, - 114,0,0,0,0,122,30,105,109,112,111,114,116,108,105,98, - 32,114,101,113,117,105,114,101,115,32,112,111,115,105,120,32, -- 111,114,32,110,116,114,24,0,0,0,114,59,0,0,0,114, -- 50,0,0,0,114,14,0,0,0,218,20,95,112,97,116,104, -- 115,101,112,115,95,119,105,116,104,95,99,111,108,111,110,99, -- 1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0, -- 4,0,0,0,83,0,0,0,115,22,0,0,0,104,0,124, -- 0,93,14,125,1,100,0,124,1,155,0,157,2,146,2,113, -- 4,83,0,114,15,0,0,0,114,10,0,0,0,114,17,0, -- 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,19,0,0,0,144,6,0,0,114,13,0,0,0,122, -- 25,95,115,101,116,117,112,46,60,108,111,99,97,108,115,62, -- 46,60,115,101,116,99,111,109,112,62,41,3,114,90,0,0, -- 0,114,98,0,0,0,114,184,0,0,0,114,215,0,0,0, -- 114,27,0,0,0,122,4,46,112,121,119,122,6,95,100,46, -- 112,121,100,84,78,41,18,114,158,0,0,0,114,21,0,0, -- 0,114,187,0,0,0,114,54,1,0,0,114,149,0,0,0, -- 218,3,97,108,108,90,18,95,98,117,105,108,116,105,110,95, -- 102,114,111,109,95,110,97,109,101,114,141,0,0,0,114,153, -- 0,0,0,114,62,0,0,0,114,61,0,0,0,114,32,0, -- 0,0,114,44,1,0,0,114,191,0,0,0,114,104,1,0, -- 0,114,126,0,0,0,114,214,0,0,0,114,218,0,0,0, -- 41,10,218,17,95,98,111,111,116,115,116,114,97,112,95,109, -- 111,100,117,108,101,90,11,115,101,108,102,95,109,111,100,117, -- 108,101,90,10,111,115,95,100,101,116,97,105,108,115,90,10, -- 98,117,105,108,116,105,110,95,111,115,114,50,0,0,0,114, -- 59,0,0,0,90,9,111,115,95,109,111,100,117,108,101,90, -- 13,98,117,105,108,116,105,110,95,110,97,109,101,115,90,12, -- 98,117,105,108,116,105,110,95,110,97,109,101,90,14,98,117, -- 105,108,116,105,110,95,109,111,100,117,108,101,114,10,0,0, -- 0,114,10,0,0,0,114,11,0,0,0,218,6,95,115,101, -- 116,117,112,109,6,0,0,115,70,0,0,0,0,8,4,1, -- 6,1,6,2,10,3,22,1,12,2,22,1,8,1,10,1, -- 10,1,6,2,2,1,10,1,10,1,12,1,12,2,8,2, -- 12,1,12,1,18,1,22,3,8,1,10,1,10,1,8,1, -- 12,1,12,2,10,1,16,3,14,1,14,1,10,1,10,1, -- 10,1,114,110,1,0,0,99,1,0,0,0,0,0,0,0, -- 0,0,0,0,2,0,0,0,4,0,0,0,67,0,0,0, -- 115,50,0,0,0,116,0,124,0,131,1,1,0,116,1,131, -- 0,125,1,116,2,106,3,160,4,116,5,106,6,124,1,142, -- 0,103,1,161,1,1,0,116,2,106,7,160,8,116,9,161, -- 1,1,0,100,1,83,0,41,2,122,41,73,110,115,116,97, -- 108,108,32,116,104,101,32,112,97,116,104,45,98,97,115,101, -- 100,32,105,109,112,111,114,116,32,99,111,109,112,111,110,101, -- 110,116,115,46,78,41,10,114,110,1,0,0,114,208,0,0, -- 0,114,21,0,0,0,114,74,1,0,0,114,191,0,0,0, -- 114,84,1,0,0,114,98,1,0,0,218,9,109,101,116,97, -- 95,112,97,116,104,114,61,0,0,0,114,68,1,0,0,41, -- 2,114,109,1,0,0,90,17,115,117,112,112,111,114,116,101, -- 100,95,108,111,97,100,101,114,115,114,10,0,0,0,114,10, -- 0,0,0,114,11,0,0,0,218,8,95,105,110,115,116,97, -- 108,108,166,6,0,0,115,8,0,0,0,0,2,8,1,6, -- 1,20,1,114,112,1,0,0,41,1,114,86,0,0,0,41, -- 1,78,41,3,78,78,78,41,2,114,0,0,0,0,114,0, -- 0,0,0,41,1,84,41,1,78,41,1,78,41,81,114,151, -- 0,0,0,114,187,0,0,0,114,90,0,0,0,114,21,0, -- 0,0,114,98,0,0,0,114,184,0,0,0,114,28,0,0, -- 0,90,11,95,77,83,95,87,73,78,68,79,87,83,114,106, -- 1,0,0,114,24,0,0,0,114,215,0,0,0,114,105,1, -- 0,0,114,50,0,0,0,114,108,1,0,0,114,59,0,0, -- 0,114,135,0,0,0,114,57,0,0,0,114,62,0,0,0, -- 114,107,1,0,0,114,31,0,0,0,90,37,95,67,65,83, -- 69,95,73,78,83,69,78,83,73,84,73,86,69,95,80,76, -- 65,84,70,79,82,77,83,95,66,89,84,69,83,95,75,69, -- 89,114,30,0,0,0,114,32,0,0,0,114,39,0,0,0, -- 114,44,0,0,0,114,46,0,0,0,114,67,0,0,0,114, -- 74,0,0,0,114,75,0,0,0,114,79,0,0,0,114,80, -- 0,0,0,114,82,0,0,0,114,85,0,0,0,114,94,0, -- 0,0,218,4,116,121,112,101,218,8,95,95,99,111,100,101, -- 95,95,114,186,0,0,0,114,37,0,0,0,114,172,0,0, -- 0,114,36,0,0,0,114,41,0,0,0,114,3,1,0,0, -- 114,115,0,0,0,114,111,0,0,0,114,126,0,0,0,114, -- 112,0,0,0,90,23,68,69,66,85,71,95,66,89,84,69, -- 67,79,68,69,95,83,85,70,70,73,88,69,83,90,27,79, -- 80,84,73,77,73,90,69,68,95,66,89,84,69,67,79,68, -- 69,95,83,85,70,70,73,88,69,83,114,120,0,0,0,114, -- 127,0,0,0,114,134,0,0,0,114,136,0,0,0,114,138, -- 0,0,0,114,160,0,0,0,114,167,0,0,0,114,176,0, -- 0,0,114,180,0,0,0,114,182,0,0,0,114,189,0,0, -- 0,114,194,0,0,0,114,195,0,0,0,114,200,0,0,0, -- 218,6,111,98,106,101,99,116,114,209,0,0,0,114,213,0, -- 0,0,114,214,0,0,0,114,231,0,0,0,114,244,0,0, -- 0,114,6,1,0,0,114,32,1,0,0,114,39,1,0,0, -- 114,44,1,0,0,114,19,1,0,0,114,45,1,0,0,114, -- 66,1,0,0,114,68,1,0,0,114,84,1,0,0,114,103, -- 1,0,0,114,208,0,0,0,114,110,1,0,0,114,112,1, -- 0,0,114,10,0,0,0,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,218,8,60,109,111,100,117,108,101,62, -- 1,0,0,0,115,170,0,0,0,4,22,8,1,8,1,8, -- 1,8,1,8,3,10,1,4,1,8,1,10,2,8,3,4, -- 1,10,2,6,2,22,1,8,1,8,1,10,1,14,4,4, -- 1,4,1,2,1,2,255,4,4,8,17,8,5,8,5,8, -- 6,4,1,10,30,8,6,8,8,8,10,8,9,8,5,8, -- 7,6,1,10,8,8,5,10,22,10,127,0,20,16,1,12, -- 2,4,1,4,2,6,2,6,2,8,2,16,71,8,40,8, -- 19,8,12,8,12,8,28,8,17,8,33,8,28,8,24,10, -- 13,10,10,10,11,8,14,6,3,4,1,2,255,12,68,14, -- 64,14,29,16,127,0,17,14,72,18,45,18,26,4,3,18, -- 58,14,63,14,42,14,127,0,20,14,127,0,27,10,23,8, -- 11,8,57, -+ 111,114,32,110,116,90,7,77,83,89,83,84,69,77,78,114, -+ 130,0,0,0,114,24,0,0,0,114,60,0,0,0,114,51, -+ 0,0,0,114,14,0,0,0,218,20,95,112,97,116,104,115, -+ 101,112,115,95,119,105,116,104,95,99,111,108,111,110,99,1, ++ 11,0,0,0,114,162,0,0,0,217,5,0,0,115,8,0, + 0,0,0,7,10,1,8,1,8,1,122,22,70,105,108,101, + 70,105,110,100,101,114,46,102,105,110,100,95,108,111,97,100, + 101,114,99,6,0,0,0,0,0,0,0,0,0,0,0,7, + 0,0,0,6,0,0,0,67,0,0,0,115,26,0,0,0, + 124,1,124,2,124,3,131,2,125,6,116,0,124,2,124,3, +- 124,6,124,4,100,1,141,4,83,0,41,2,78,114,201,0, +- 0,0,41,1,114,213,0,0,0,41,7,114,142,0,0,0, +- 114,211,0,0,0,114,163,0,0,0,114,65,0,0,0,90, +- 4,115,109,115,108,114,225,0,0,0,114,164,0,0,0,114, +- 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,83, ++ 124,6,124,4,100,1,141,4,83,0,41,2,78,114,202,0, ++ 0,0,41,1,114,214,0,0,0,41,7,114,143,0,0,0, ++ 114,212,0,0,0,114,164,0,0,0,114,66,0,0,0,90, ++ 4,115,109,115,108,114,226,0,0,0,114,165,0,0,0,114, ++ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,84, + 1,0,0,229,5,0,0,115,8,0,0,0,0,1,10,1, + 8,1,2,255,122,20,70,105,108,101,70,105,110,100,101,114, + 46,95,103,101,116,95,115,112,101,99,78,99,3,0,0,0, +@@ -2503,28 +2503,28 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 32,82,101,116,117,114,110,115,32,116,104,101,32,109,97,116, + 99,104,105,110,103,32,115,112,101,99,44,32,111,114,32,78, + 111,110,101,32,105,102,32,110,111,116,32,102,111,117,110,100, +- 46,10,32,32,32,32,32,32,32,32,70,114,96,0,0,0, +- 114,45,0,0,0,114,129,0,0,0,114,232,0,0,0,78, ++ 46,10,32,32,32,32,32,32,32,32,70,114,97,0,0,0, ++ 114,46,0,0,0,114,130,0,0,0,114,233,0,0,0,78, + 122,9,116,114,121,105,110,103,32,123,125,41,1,90,9,118, + 101,114,98,111,115,105,116,121,122,25,112,111,115,115,105,98, + 108,101,32,110,97,109,101,115,112,97,99,101,32,102,111,114, +- 32,123,125,41,23,114,103,0,0,0,114,75,0,0,0,114, +- 65,0,0,0,114,24,0,0,0,114,81,0,0,0,114,33, +- 1,0,0,114,76,0,0,0,114,89,1,0,0,218,11,95, +- 102,105,108,108,95,99,97,99,104,101,114,27,0,0,0,114, +- 92,1,0,0,114,130,0,0,0,114,91,1,0,0,114,67, +- 0,0,0,114,88,1,0,0,114,80,0,0,0,114,83,1, +- 0,0,114,82,0,0,0,114,110,0,0,0,114,158,0,0, +- 0,114,173,0,0,0,114,207,0,0,0,114,202,0,0,0, +- 41,14,114,142,0,0,0,114,163,0,0,0,114,225,0,0, ++ 32,123,125,41,23,114,104,0,0,0,114,76,0,0,0,114, ++ 66,0,0,0,114,24,0,0,0,114,82,0,0,0,114,34, ++ 1,0,0,114,77,0,0,0,114,90,1,0,0,218,11,95, ++ 102,105,108,108,95,99,97,99,104,101,114,28,0,0,0,114, ++ 93,1,0,0,114,131,0,0,0,114,92,1,0,0,114,68, ++ 0,0,0,114,89,1,0,0,114,81,0,0,0,114,84,1, ++ 0,0,114,83,0,0,0,114,111,0,0,0,114,159,0,0, ++ 0,114,174,0,0,0,114,208,0,0,0,114,203,0,0,0, ++ 41,14,114,143,0,0,0,114,164,0,0,0,114,226,0,0, + 0,90,12,105,115,95,110,97,109,101,115,112,97,99,101,90, +- 11,116,97,105,108,95,109,111,100,117,108,101,114,193,0,0, ++ 11,116,97,105,108,95,109,111,100,117,108,101,114,194,0,0, + 0,90,5,99,97,99,104,101,90,12,99,97,99,104,101,95, + 109,111,100,117,108,101,90,9,98,97,115,101,95,112,97,116, +- 104,114,41,1,0,0,114,211,0,0,0,90,13,105,110,105, ++ 104,114,42,1,0,0,114,212,0,0,0,90,13,105,110,105, + 116,95,102,105,108,101,110,97,109,101,90,9,102,117,108,108, +- 95,112,97,116,104,114,210,0,0,0,114,10,0,0,0,114, +- 10,0,0,0,114,11,0,0,0,114,226,0,0,0,234,5, ++ 95,112,97,116,104,114,211,0,0,0,114,10,0,0,0,114, ++ 10,0,0,0,114,11,0,0,0,114,227,0,0,0,234,5, + 0,0,115,78,0,0,0,0,5,4,1,14,1,2,1,24, + 1,12,1,10,1,10,1,8,1,6,2,6,1,6,1,10, + 2,6,1,4,2,8,1,12,1,14,1,8,1,10,1,8, +@@ -2550,29 +2550,29 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 116,105,97,108,32,109,111,100,117,108,101,115,32,97,110,100, + 32,112,97,99,107,97,103,101,115,32,102,111,114,32,116,104, + 105,115,32,100,105,114,101,99,116,111,114,121,46,114,20,0, +- 0,0,114,96,0,0,0,114,87,0,0,0,99,1,0,0, ++ 0,0,114,97,0,0,0,114,88,0,0,0,99,1,0,0, + 0,0,0,0,0,0,0,0,0,2,0,0,0,4,0,0, + 0,83,0,0,0,115,20,0,0,0,104,0,124,0,93,12, + 125,1,124,1,160,0,161,0,146,2,113,4,83,0,114,10, +- 0,0,0,41,1,114,130,0,0,0,41,2,114,8,0,0, ++ 0,0,0,41,1,114,131,0,0,0,41,2,114,8,0,0, + 0,90,2,102,110,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,114,19,0,0,0,58,6,0,0,114,13,0, + 0,0,122,41,70,105,108,101,70,105,110,100,101,114,46,95, + 102,105,108,108,95,99,97,99,104,101,46,60,108,111,99,97, + 108,115,62,46,60,115,101,116,99,111,109,112,62,78,41,18, +- 114,65,0,0,0,114,24,0,0,0,114,30,1,0,0,114, +- 81,0,0,0,114,26,1,0,0,218,15,80,101,114,109,105, ++ 114,66,0,0,0,114,24,0,0,0,114,31,1,0,0,114, ++ 82,0,0,0,114,27,1,0,0,218,15,80,101,114,109,105, + 115,115,105,111,110,69,114,114,111,114,218,18,78,111,116,65, + 68,105,114,101,99,116,111,114,121,69,114,114,111,114,114,21, +- 0,0,0,114,28,0,0,0,114,29,0,0,0,114,90,1, +- 0,0,114,91,1,0,0,114,125,0,0,0,114,88,0,0, +- 0,114,130,0,0,0,218,3,97,100,100,114,30,0,0,0, +- 114,92,1,0,0,41,9,114,142,0,0,0,114,65,0,0, +- 0,114,31,1,0,0,90,21,108,111,119,101,114,95,115,117, +- 102,102,105,120,95,99,111,110,116,101,110,116,115,114,66,1, +- 0,0,114,140,0,0,0,114,54,1,0,0,114,41,1,0, ++ 0,0,0,114,29,0,0,0,114,30,0,0,0,114,91,1, ++ 0,0,114,92,1,0,0,114,126,0,0,0,114,89,0,0, ++ 0,114,131,0,0,0,218,3,97,100,100,114,31,0,0,0, ++ 114,93,1,0,0,41,9,114,143,0,0,0,114,66,0,0, ++ 0,114,32,1,0,0,90,21,108,111,119,101,114,95,115,117, ++ 102,102,105,120,95,99,111,110,116,101,110,116,115,114,67,1, ++ 0,0,114,141,0,0,0,114,55,1,0,0,114,42,1,0, + 0,90,8,110,101,119,95,110,97,109,101,114,10,0,0,0, +- 114,10,0,0,0,114,11,0,0,0,114,94,1,0,0,29, ++ 114,10,0,0,0,114,11,0,0,0,114,95,1,0,0,29, + 6,0,0,115,34,0,0,0,0,2,6,1,2,1,22,1, + 18,3,10,3,12,1,12,7,6,1,8,1,16,1,4,1, + 18,2,4,1,12,1,6,1,12,1,122,22,70,105,108,101, +@@ -2607,8 +2607,8 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 110,101,114,121,46,70,105,108,101,70,105,110,100,101,114,46, + 122,30,111,110,108,121,32,100,105,114,101,99,116,111,114,105, + 101,115,32,97,114,101,32,115,117,112,112,111,114,116,101,100, +- 114,71,0,0,0,41,2,114,82,0,0,0,114,141,0,0, +- 0,114,71,0,0,0,169,2,114,216,0,0,0,114,93,1, ++ 114,72,0,0,0,41,2,114,83,0,0,0,114,142,0,0, ++ 0,114,72,0,0,0,169,2,114,217,0,0,0,114,94,1, + 0,0,114,10,0,0,0,114,11,0,0,0,218,24,112,97, + 116,104,95,104,111,111,107,95,102,111,114,95,70,105,108,101, + 70,105,110,100,101,114,70,6,0,0,115,6,0,0,0,0, +@@ -2616,8 +2616,8 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 114,46,112,97,116,104,95,104,111,111,107,46,60,108,111,99, + 97,108,115,62,46,112,97,116,104,95,104,111,111,107,95,102, + 111,114,95,70,105,108,101,70,105,110,100,101,114,114,10,0, +- 0,0,41,3,114,216,0,0,0,114,93,1,0,0,114,99, +- 1,0,0,114,10,0,0,0,114,98,1,0,0,114,11,0, ++ 0,0,41,3,114,217,0,0,0,114,94,1,0,0,114,100, ++ 1,0,0,114,10,0,0,0,114,99,1,0,0,114,11,0, + 0,0,218,9,112,97,116,104,95,104,111,111,107,60,6,0, + 0,115,4,0,0,0,0,10,14,6,122,20,70,105,108,101, + 70,105,110,100,101,114,46,112,97,116,104,95,104,111,111,107, +@@ -2625,19 +2625,19 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,3,0,0,0,67,0,0,0,115,12,0,0,0,100,1, + 160,0,124,0,106,1,161,1,83,0,41,2,78,122,16,70, + 105,108,101,70,105,110,100,101,114,40,123,33,114,125,41,41, +- 2,114,88,0,0,0,114,65,0,0,0,114,13,1,0,0, ++ 2,114,89,0,0,0,114,66,0,0,0,114,14,1,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, +- 64,1,0,0,78,6,0,0,115,2,0,0,0,0,1,122, ++ 65,1,0,0,78,6,0,0,115,2,0,0,0,0,1,122, + 19,70,105,108,101,70,105,110,100,101,114,46,95,95,114,101, +- 112,114,95,95,41,1,78,41,15,114,149,0,0,0,114,148, +- 0,0,0,114,150,0,0,0,114,151,0,0,0,114,232,0, +- 0,0,114,71,1,0,0,114,167,0,0,0,114,229,0,0, +- 0,114,161,0,0,0,114,83,1,0,0,114,226,0,0,0, +- 114,94,1,0,0,114,230,0,0,0,114,100,1,0,0,114, +- 64,1,0,0,114,10,0,0,0,114,10,0,0,0,114,10, +- 0,0,0,114,11,0,0,0,114,86,1,0,0,186,5,0, ++ 112,114,95,95,41,1,78,41,15,114,150,0,0,0,114,149, ++ 0,0,0,114,151,0,0,0,114,152,0,0,0,114,233,0, ++ 0,0,114,72,1,0,0,114,168,0,0,0,114,230,0,0, ++ 0,114,162,0,0,0,114,84,1,0,0,114,227,0,0,0, ++ 114,95,1,0,0,114,231,0,0,0,114,101,1,0,0,114, ++ 65,1,0,0,114,10,0,0,0,114,10,0,0,0,114,10, ++ 0,0,0,114,11,0,0,0,114,87,1,0,0,186,5,0, + 0,115,22,0,0,0,8,2,4,7,8,16,8,4,4,2, +- 8,12,8,5,10,51,8,31,2,1,10,17,114,86,1,0, ++ 8,12,8,5,10,51,8,31,2,1,10,17,114,87,1,0, + 0,99,4,0,0,0,0,0,0,0,0,0,0,0,6,0, + 0,0,8,0,0,0,67,0,0,0,115,144,0,0,0,124, + 0,160,0,100,1,161,1,125,4,124,0,160,0,100,2,161, +@@ -2650,18 +2650,18 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,100,5,60,0,87,0,110,18,4,0,116,5,121,138,1, + 0,1,0,1,0,89,0,110,2,48,0,100,0,83,0,41, + 6,78,218,10,95,95,108,111,97,100,101,114,95,95,218,8, +- 95,95,115,112,101,99,95,95,114,87,1,0,0,90,8,95, ++ 95,95,115,112,101,99,95,95,114,88,1,0,0,90,8,95, + 95,102,105,108,101,95,95,90,10,95,95,99,97,99,104,101, +- 100,95,95,41,6,218,3,103,101,116,114,164,0,0,0,114, +- 39,1,0,0,114,32,1,0,0,114,213,0,0,0,218,9, ++ 100,95,95,41,6,218,3,103,101,116,114,165,0,0,0,114, ++ 40,1,0,0,114,33,1,0,0,114,214,0,0,0,218,9, + 69,120,99,101,112,116,105,111,110,41,6,90,2,110,115,114, +- 140,0,0,0,90,8,112,97,116,104,110,97,109,101,90,9, +- 99,112,97,116,104,110,97,109,101,114,164,0,0,0,114,210, ++ 141,0,0,0,90,8,112,97,116,104,110,97,109,101,90,9, ++ 99,112,97,116,104,110,97,109,101,114,165,0,0,0,114,211, + 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, + 0,0,218,14,95,102,105,120,95,117,112,95,109,111,100,117, + 108,101,84,6,0,0,115,34,0,0,0,0,2,10,1,10, + 1,4,1,4,1,8,1,8,1,12,2,10,1,4,1,14, +- 1,2,1,8,1,8,1,8,1,12,1,12,2,114,105,1, ++ 1,2,1,8,1,8,1,8,1,12,1,12,2,114,106,1, + 0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,3, + 0,0,0,3,0,0,0,67,0,0,0,115,38,0,0,0, + 116,0,116,1,160,2,161,0,102,2,125,0,116,3,116,4, +@@ -2672,17 +2672,17 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 97,100,101,114,115,46,10,10,32,32,32,32,69,97,99,104, + 32,105,116,101,109,32,105,115,32,97,32,116,117,112,108,101, + 32,40,108,111,97,100,101,114,44,32,115,117,102,102,105,120, +- 101,115,41,46,10,32,32,32,32,41,7,114,19,1,0,0, +- 114,187,0,0,0,218,18,101,120,116,101,110,115,105,111,110, +- 95,115,117,102,102,105,120,101,115,114,32,1,0,0,114,126, +- 0,0,0,114,39,1,0,0,114,112,0,0,0,41,3,90, ++ 101,115,41,46,10,32,32,32,32,41,7,114,20,1,0,0, ++ 114,188,0,0,0,218,18,101,120,116,101,110,115,105,111,110, ++ 95,115,117,102,102,105,120,101,115,114,33,1,0,0,114,127, ++ 0,0,0,114,40,1,0,0,114,113,0,0,0,41,3,90, + 10,101,120,116,101,110,115,105,111,110,115,90,6,115,111,117, + 114,99,101,90,8,98,121,116,101,99,111,100,101,114,10,0, +- 0,0,114,10,0,0,0,114,11,0,0,0,114,208,0,0, ++ 0,0,114,10,0,0,0,114,11,0,0,0,114,209,0,0, + 0,107,6,0,0,115,8,0,0,0,0,5,12,1,8,1, +- 8,1,114,208,0,0,0,99,1,0,0,0,0,0,0,0, ++ 8,1,114,209,0,0,0,99,1,0,0,0,0,0,0,0, + 0,0,0,0,10,0,0,0,9,0,0,0,67,0,0,0, +- 115,132,1,0,0,124,0,97,0,116,0,106,1,97,1,116, ++ 115,164,1,0,0,124,0,97,0,116,0,106,1,97,1,116, + 0,106,2,97,2,116,1,106,3,116,4,25,0,125,1,100, + 1,100,2,103,1,102,2,100,3,100,4,100,2,103,2,102, + 2,102,2,125,2,124,2,68,0,93,108,92,2,125,3,125, +@@ -2692,21 +2692,23 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 0,125,6,1,0,113,170,113,52,122,20,116,0,160,6,124, + 3,161,1,125,6,87,0,1,0,113,170,87,0,113,52,4, + 0,116,7,121,158,1,0,1,0,1,0,89,0,113,52,89, +- 0,113,52,48,0,113,52,116,7,100,8,131,1,130,1,116, +- 8,124,1,100,9,124,6,131,3,1,0,116,8,124,1,100, +- 10,124,5,131,3,1,0,116,8,124,1,100,11,100,12,160, +- 9,124,4,161,1,131,3,1,0,116,8,124,1,100,13,100, +- 14,100,15,132,0,124,4,68,0,131,1,131,3,1,0,103, +- 0,100,16,162,1,125,7,124,3,100,3,107,2,144,1,114, +- 6,124,7,160,10,100,17,161,1,1,0,124,7,68,0,93, +- 52,125,8,124,8,116,1,106,3,118,1,144,1,114,38,116, ++ 0,113,52,48,0,113,52,116,7,100,8,131,1,130,1,100, ++ 9,124,6,106,8,118,0,114,202,124,4,100,10,100,10,100, ++ 11,133,3,25,0,125,4,124,4,100,7,25,0,125,5,116, ++ 9,124,1,100,12,124,6,131,3,1,0,116,9,124,1,100, ++ 13,124,5,131,3,1,0,116,9,124,1,100,14,100,15,160, ++ 10,124,4,161,1,131,3,1,0,116,9,124,1,100,16,100, ++ 17,100,18,132,0,124,4,68,0,131,1,131,3,1,0,103, ++ 0,100,19,162,1,125,7,124,3,100,3,107,2,144,1,114, ++ 38,124,7,160,11,100,20,161,1,1,0,124,7,68,0,93, ++ 52,125,8,124,8,116,1,106,3,118,1,144,1,114,70,116, + 0,160,6,124,8,161,1,125,9,110,10,116,1,106,3,124, +- 8,25,0,125,9,116,8,124,1,124,8,124,9,131,3,1, +- 0,144,1,113,10,116,8,124,1,100,18,116,11,131,0,131, +- 3,1,0,116,12,160,13,116,2,160,14,161,0,161,1,1, +- 0,124,3,100,3,107,2,144,1,114,128,116,15,160,10,100, +- 19,161,1,1,0,100,20,116,12,118,0,144,1,114,128,100, +- 21,116,16,95,17,100,22,83,0,41,23,122,205,83,101,116, ++ 8,25,0,125,9,116,9,124,1,124,8,124,9,131,3,1, ++ 0,144,1,113,42,116,9,124,1,100,21,116,12,131,0,131, ++ 3,1,0,116,13,160,14,116,2,160,15,161,0,161,1,1, ++ 0,124,3,100,3,107,2,144,1,114,160,116,16,160,11,100, ++ 22,161,1,1,0,100,23,116,13,118,0,144,1,114,160,100, ++ 24,116,17,95,18,100,10,83,0,41,25,122,205,83,101,116, + 117,112,32,116,104,101,32,112,97,116,104,45,98,97,115,101, + 100,32,105,109,112,111,114,116,101,114,115,32,102,111,114,32, + 105,109,112,111,114,116,108,105,98,32,98,121,32,105,109,112, +@@ -2731,102 +2733,103 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = { + 97,108,115,62,46,60,103,101,110,101,120,112,114,62,114,0, + 0,0,0,122,30,105,109,112,111,114,116,108,105,98,32,114, + 101,113,117,105,114,101,115,32,112,111,115,105,120,32,111,114, +- 32,110,116,114,24,0,0,0,114,59,0,0,0,114,50,0, +- 0,0,114,14,0,0,0,218,20,95,112,97,116,104,115,101, +- 112,115,95,119,105,116,104,95,99,111,108,111,110,99,1,0, +- 0,0,0,0,0,0,0,0,0,0,2,0,0,0,4,0, +- 0,0,83,0,0,0,115,22,0,0,0,104,0,124,0,93, +- 14,125,1,100,0,124,1,155,0,157,2,146,2,113,4,83, +- 0,114,15,0,0,0,114,10,0,0,0,114,17,0,0,0, +- 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, +- 19,0,0,0,153,6,0,0,114,13,0,0,0,122,25,95, +- 115,101,116,117,112,46,60,108,111,99,97,108,115,62,46,60, +- 115,101,116,99,111,109,112,62,41,3,114,90,0,0,0,114, +- 98,0,0,0,114,184,0,0,0,114,215,0,0,0,114,27, +- 0,0,0,122,4,46,112,121,119,122,6,95,100,46,112,121, +- 100,84,78,41,18,114,158,0,0,0,114,21,0,0,0,114, +- 187,0,0,0,114,56,1,0,0,114,149,0,0,0,218,3, +- 97,108,108,90,18,95,98,117,105,108,116,105,110,95,102,114, +- 111,109,95,110,97,109,101,114,141,0,0,0,114,153,0,0, +- 0,114,62,0,0,0,114,61,0,0,0,114,32,0,0,0, +- 114,44,1,0,0,114,191,0,0,0,114,106,1,0,0,114, +- 126,0,0,0,114,214,0,0,0,114,218,0,0,0,41,10, +- 218,17,95,98,111,111,116,115,116,114,97,112,95,109,111,100, +- 117,108,101,90,11,115,101,108,102,95,109,111,100,117,108,101, +- 90,10,111,115,95,100,101,116,97,105,108,115,90,10,98,117, +- 105,108,116,105,110,95,111,115,114,50,0,0,0,114,59,0, +- 0,0,90,9,111,115,95,109,111,100,117,108,101,90,13,98, +- 117,105,108,116,105,110,95,110,97,109,101,115,90,12,98,117, +- 105,108,116,105,110,95,110,97,109,101,90,14,98,117,105,108, +- 116,105,110,95,109,111,100,117,108,101,114,10,0,0,0,114, +- 10,0,0,0,114,11,0,0,0,218,6,95,115,101,116,117, +- 112,118,6,0,0,115,70,0,0,0,0,8,4,1,6,1, +- 6,2,10,3,22,1,12,2,22,1,8,1,10,1,10,1, +- 6,2,2,1,10,1,10,1,12,1,12,2,8,2,12,1, +- 12,1,18,1,22,3,8,1,10,1,10,1,8,1,12,1, +- 12,2,10,1,16,3,14,1,14,1,10,1,10,1,10,1, +- 114,112,1,0,0,99,1,0,0,0,0,0,0,0,0,0, +- 0,0,2,0,0,0,4,0,0,0,67,0,0,0,115,50, +- 0,0,0,116,0,124,0,131,1,1,0,116,1,131,0,125, +- 1,116,2,106,3,160,4,116,5,106,6,124,1,142,0,103, +- 1,161,1,1,0,116,2,106,7,160,8,116,9,161,1,1, +- 0,100,1,83,0,41,2,122,41,73,110,115,116,97,108,108, +- 32,116,104,101,32,112,97,116,104,45,98,97,115,101,100,32, +- 105,109,112,111,114,116,32,99,111,109,112,111,110,101,110,116, +- 115,46,78,41,10,114,112,1,0,0,114,208,0,0,0,114, +- 21,0,0,0,114,76,1,0,0,114,191,0,0,0,114,86, +- 1,0,0,114,100,1,0,0,218,9,109,101,116,97,95,112, +- 97,116,104,114,61,0,0,0,114,70,1,0,0,41,2,114, +- 111,1,0,0,90,17,115,117,112,112,111,114,116,101,100,95, +- 108,111,97,100,101,114,115,114,10,0,0,0,114,10,0,0, +- 0,114,11,0,0,0,218,8,95,105,110,115,116,97,108,108, +- 175,6,0,0,115,8,0,0,0,0,2,8,1,6,1,20, +- 1,114,114,1,0,0,41,1,114,86,0,0,0,41,1,78, +- 41,3,78,78,78,41,2,114,0,0,0,0,114,0,0,0, +- 0,41,1,84,41,1,78,41,1,78,41,81,114,151,0,0, +- 0,114,187,0,0,0,114,90,0,0,0,114,21,0,0,0, +- 114,98,0,0,0,114,184,0,0,0,114,28,0,0,0,90, +- 11,95,77,83,95,87,73,78,68,79,87,83,114,108,1,0, +- 0,114,24,0,0,0,114,215,0,0,0,114,107,1,0,0, +- 114,50,0,0,0,114,110,1,0,0,114,59,0,0,0,114, +- 135,0,0,0,114,57,0,0,0,114,62,0,0,0,114,109, +- 1,0,0,114,31,0,0,0,90,37,95,67,65,83,69,95, +- 73,78,83,69,78,83,73,84,73,86,69,95,80,76,65,84, +- 70,79,82,77,83,95,66,89,84,69,83,95,75,69,89,114, +- 30,0,0,0,114,32,0,0,0,114,39,0,0,0,114,44, +- 0,0,0,114,46,0,0,0,114,67,0,0,0,114,74,0, +- 0,0,114,75,0,0,0,114,79,0,0,0,114,80,0,0, +- 0,114,82,0,0,0,114,85,0,0,0,114,94,0,0,0, +- 218,4,116,121,112,101,218,8,95,95,99,111,100,101,95,95, +- 114,186,0,0,0,114,37,0,0,0,114,172,0,0,0,114, +- 36,0,0,0,114,41,0,0,0,114,3,1,0,0,114,115, +- 0,0,0,114,111,0,0,0,114,126,0,0,0,114,112,0, +- 0,0,90,23,68,69,66,85,71,95,66,89,84,69,67,79, +- 68,69,95,83,85,70,70,73,88,69,83,90,27,79,80,84, +- 73,77,73,90,69,68,95,66,89,84,69,67,79,68,69,95, +- 83,85,70,70,73,88,69,83,114,120,0,0,0,114,127,0, +- 0,0,114,134,0,0,0,114,136,0,0,0,114,138,0,0, +- 0,114,160,0,0,0,114,167,0,0,0,114,176,0,0,0, +- 114,180,0,0,0,114,182,0,0,0,114,189,0,0,0,114, +- 194,0,0,0,114,195,0,0,0,114,200,0,0,0,218,6, +- 111,98,106,101,99,116,114,209,0,0,0,114,213,0,0,0, +- 114,214,0,0,0,114,231,0,0,0,114,244,0,0,0,114, +- 6,1,0,0,114,32,1,0,0,114,39,1,0,0,114,44, +- 1,0,0,114,19,1,0,0,114,45,1,0,0,114,68,1, +- 0,0,114,70,1,0,0,114,86,1,0,0,114,105,1,0, +- 0,114,208,0,0,0,114,112,1,0,0,114,114,1,0,0, +- 114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114, +- 11,0,0,0,218,8,60,109,111,100,117,108,101,62,1,0, +- 0,0,115,170,0,0,0,4,22,8,1,8,1,8,1,8, +- 1,8,3,10,1,4,1,8,1,10,2,8,3,4,1,10, +- 2,6,2,22,1,8,1,8,1,10,1,14,4,4,1,4, +- 1,2,1,2,255,4,4,8,17,8,5,8,5,8,6,4, +- 1,10,30,8,6,8,8,8,10,8,9,8,5,8,7,6, +- 1,10,8,8,5,10,22,10,127,0,20,16,1,12,2,4, +- 1,4,2,6,2,6,2,8,2,16,71,8,40,8,19,8, +- 12,8,12,8,28,8,17,8,33,8,28,8,24,10,13,10, +- 10,10,11,8,14,6,3,4,1,2,255,12,68,14,64,14, +- 29,16,127,0,17,14,72,18,45,18,26,4,3,18,58,14, +- 69,14,42,14,127,0,23,14,127,0,27,10,23,8,11,8, +- 57, ++ 32,110,116,90,7,77,83,89,83,84,69,77,78,114,130,0, ++ 0,0,114,24,0,0,0,114,60,0,0,0,114,51,0,0, ++ 0,114,14,0,0,0,218,20,95,112,97,116,104,115,101,112, ++ 115,95,119,105,116,104,95,99,111,108,111,110,99,1,0,0, ++ 0,0,0,0,0,0,0,0,0,2,0,0,0,4,0,0, ++ 0,83,0,0,0,115,22,0,0,0,104,0,124,0,93,14, ++ 125,1,100,0,124,1,155,0,157,2,146,2,113,4,83,0, ++ 114,15,0,0,0,114,10,0,0,0,114,17,0,0,0,114, ++ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,19, ++ 0,0,0,157,6,0,0,114,13,0,0,0,122,25,95,115, ++ 101,116,117,112,46,60,108,111,99,97,108,115,62,46,60,115, ++ 101,116,99,111,109,112,62,41,3,114,91,0,0,0,114,99, ++ 0,0,0,114,185,0,0,0,114,216,0,0,0,114,28,0, ++ 0,0,122,4,46,112,121,119,122,6,95,100,46,112,121,100, ++ 84,41,19,114,159,0,0,0,114,21,0,0,0,114,188,0, ++ 0,0,114,57,1,0,0,114,150,0,0,0,218,3,97,108, ++ 108,90,18,95,98,117,105,108,116,105,110,95,102,114,111,109, ++ 95,110,97,109,101,114,142,0,0,0,114,25,0,0,0,114, ++ 154,0,0,0,114,63,0,0,0,114,62,0,0,0,114,33, ++ 0,0,0,114,45,1,0,0,114,192,0,0,0,114,107,1, ++ 0,0,114,127,0,0,0,114,215,0,0,0,114,219,0,0, ++ 0,41,10,218,17,95,98,111,111,116,115,116,114,97,112,95, ++ 109,111,100,117,108,101,90,11,115,101,108,102,95,109,111,100, ++ 117,108,101,90,10,111,115,95,100,101,116,97,105,108,115,90, ++ 10,98,117,105,108,116,105,110,95,111,115,114,51,0,0,0, ++ 114,60,0,0,0,90,9,111,115,95,109,111,100,117,108,101, ++ 90,13,98,117,105,108,116,105,110,95,110,97,109,101,115,90, ++ 12,98,117,105,108,116,105,110,95,110,97,109,101,90,14,98, ++ 117,105,108,116,105,110,95,109,111,100,117,108,101,114,10,0, ++ 0,0,114,10,0,0,0,114,11,0,0,0,218,6,95,115, ++ 101,116,117,112,118,6,0,0,115,76,0,0,0,0,8,4, ++ 1,6,1,6,2,10,3,22,1,12,2,22,1,8,1,10, ++ 1,10,1,6,2,2,1,10,1,10,1,12,1,12,2,8, ++ 2,10,1,14,1,8,2,12,1,12,1,18,1,22,3,8, ++ 1,10,1,10,1,8,1,12,1,12,2,10,1,16,3,14, ++ 1,14,1,10,1,10,1,10,1,114,113,1,0,0,99,1, + 0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,4, -+ 0,0,0,83,0,0,0,115,22,0,0,0,104,0,124,0, -+ 93,14,125,1,100,0,124,1,155,0,157,2,146,2,113,4, -+ 83,0,114,15,0,0,0,114,10,0,0,0,114,17,0,0, -+ 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, -+ 114,19,0,0,0,148,6,0,0,114,13,0,0,0,122,25, -+ 95,115,101,116,117,112,46,60,108,111,99,97,108,115,62,46, -+ 60,115,101,116,99,111,109,112,62,41,3,114,91,0,0,0, -+ 114,99,0,0,0,114,185,0,0,0,114,216,0,0,0,114, -+ 28,0,0,0,122,4,46,112,121,119,122,6,95,100,46,112, -+ 121,100,84,41,19,114,159,0,0,0,114,21,0,0,0,114, -+ 188,0,0,0,114,55,1,0,0,114,150,0,0,0,218,3, -+ 97,108,108,90,18,95,98,117,105,108,116,105,110,95,102,114, -+ 111,109,95,110,97,109,101,114,142,0,0,0,114,25,0,0, -+ 0,114,154,0,0,0,114,63,0,0,0,114,62,0,0,0, -+ 114,33,0,0,0,114,45,1,0,0,114,192,0,0,0,114, -+ 105,1,0,0,114,127,0,0,0,114,215,0,0,0,114,219, -+ 0,0,0,41,10,218,17,95,98,111,111,116,115,116,114,97, -+ 112,95,109,111,100,117,108,101,90,11,115,101,108,102,95,109, -+ 111,100,117,108,101,90,10,111,115,95,100,101,116,97,105,108, -+ 115,90,10,98,117,105,108,116,105,110,95,111,115,114,51,0, -+ 0,0,114,60,0,0,0,90,9,111,115,95,109,111,100,117, -+ 108,101,90,13,98,117,105,108,116,105,110,95,110,97,109,101, -+ 115,90,12,98,117,105,108,116,105,110,95,110,97,109,101,90, -+ 14,98,117,105,108,116,105,110,95,109,111,100,117,108,101,114, -+ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,6, -+ 95,115,101,116,117,112,109,6,0,0,115,76,0,0,0,0, -+ 8,4,1,6,1,6,2,10,3,22,1,12,2,22,1,8, -+ 1,10,1,10,1,6,2,2,1,10,1,10,1,12,1,12, -+ 2,8,2,10,1,14,1,8,2,12,1,12,1,18,1,22, -+ 3,8,1,10,1,10,1,8,1,12,1,12,2,10,1,16, -+ 3,14,1,14,1,10,1,10,1,10,1,114,111,1,0,0, -+ 99,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0, -+ 0,4,0,0,0,67,0,0,0,115,50,0,0,0,116,0, -+ 124,0,131,1,1,0,116,1,131,0,125,1,116,2,106,3, -+ 160,4,116,5,106,6,124,1,142,0,103,1,161,1,1,0, -+ 116,2,106,7,160,8,116,9,161,1,1,0,100,1,83,0, -+ 41,2,122,41,73,110,115,116,97,108,108,32,116,104,101,32, -+ 112,97,116,104,45,98,97,115,101,100,32,105,109,112,111,114, -+ 116,32,99,111,109,112,111,110,101,110,116,115,46,78,41,10, -+ 114,111,1,0,0,114,209,0,0,0,114,21,0,0,0,114, -+ 75,1,0,0,114,192,0,0,0,114,85,1,0,0,114,99, -+ 1,0,0,218,9,109,101,116,97,95,112,97,116,104,114,62, -+ 0,0,0,114,69,1,0,0,41,2,114,110,1,0,0,90, -+ 17,115,117,112,112,111,114,116,101,100,95,108,111,97,100,101, -+ 114,115,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -+ 0,218,8,95,105,110,115,116,97,108,108,170,6,0,0,115, -+ 8,0,0,0,0,2,8,1,6,1,20,1,114,113,1,0, -+ 0,41,1,114,87,0,0,0,41,1,78,41,3,78,78,78, -+ 41,2,114,0,0,0,0,114,0,0,0,0,41,1,84,41, -+ 1,78,41,1,78,41,81,114,152,0,0,0,114,188,0,0, -+ 0,114,91,0,0,0,114,21,0,0,0,114,99,0,0,0, -+ 114,185,0,0,0,114,29,0,0,0,90,11,95,77,83,95, -+ 87,73,78,68,79,87,83,114,107,1,0,0,114,24,0,0, -+ 0,114,216,0,0,0,114,106,1,0,0,114,51,0,0,0, -+ 114,109,1,0,0,114,60,0,0,0,114,136,0,0,0,114, -+ 58,0,0,0,114,63,0,0,0,114,108,1,0,0,114,32, -+ 0,0,0,90,37,95,67,65,83,69,95,73,78,83,69,78, -+ 83,73,84,73,86,69,95,80,76,65,84,70,79,82,77,83, -+ 95,66,89,84,69,83,95,75,69,89,114,31,0,0,0,114, -+ 33,0,0,0,114,40,0,0,0,114,45,0,0,0,114,47, -+ 0,0,0,114,68,0,0,0,114,75,0,0,0,114,76,0, -+ 0,0,114,80,0,0,0,114,81,0,0,0,114,83,0,0, -+ 0,114,86,0,0,0,114,95,0,0,0,218,4,116,121,112, -+ 101,218,8,95,95,99,111,100,101,95,95,114,187,0,0,0, -+ 114,38,0,0,0,114,173,0,0,0,114,37,0,0,0,114, -+ 42,0,0,0,114,4,1,0,0,114,116,0,0,0,114,112, -+ 0,0,0,114,127,0,0,0,114,113,0,0,0,90,23,68, -+ 69,66,85,71,95,66,89,84,69,67,79,68,69,95,83,85, -+ 70,70,73,88,69,83,90,27,79,80,84,73,77,73,90,69, -+ 68,95,66,89,84,69,67,79,68,69,95,83,85,70,70,73, -+ 88,69,83,114,121,0,0,0,114,128,0,0,0,114,135,0, -+ 0,0,114,137,0,0,0,114,139,0,0,0,114,161,0,0, -+ 0,114,168,0,0,0,114,177,0,0,0,114,181,0,0,0, -+ 114,183,0,0,0,114,190,0,0,0,114,195,0,0,0,114, -+ 196,0,0,0,114,201,0,0,0,218,6,111,98,106,101,99, -+ 116,114,210,0,0,0,114,214,0,0,0,114,215,0,0,0, -+ 114,232,0,0,0,114,245,0,0,0,114,7,1,0,0,114, -+ 33,1,0,0,114,40,1,0,0,114,45,1,0,0,114,20, -+ 1,0,0,114,46,1,0,0,114,67,1,0,0,114,69,1, -+ 0,0,114,85,1,0,0,114,104,1,0,0,114,209,0,0, -+ 0,114,111,1,0,0,114,113,1,0,0,114,10,0,0,0, ++ 0,0,0,67,0,0,0,115,50,0,0,0,116,0,124,0, ++ 131,1,1,0,116,1,131,0,125,1,116,2,106,3,160,4, ++ 116,5,106,6,124,1,142,0,103,1,161,1,1,0,116,2, ++ 106,7,160,8,116,9,161,1,1,0,100,1,83,0,41,2, ++ 122,41,73,110,115,116,97,108,108,32,116,104,101,32,112,97, ++ 116,104,45,98,97,115,101,100,32,105,109,112,111,114,116,32, ++ 99,111,109,112,111,110,101,110,116,115,46,78,41,10,114,113, ++ 1,0,0,114,209,0,0,0,114,21,0,0,0,114,77,1, ++ 0,0,114,192,0,0,0,114,87,1,0,0,114,101,1,0, ++ 0,218,9,109,101,116,97,95,112,97,116,104,114,62,0,0, ++ 0,114,71,1,0,0,41,2,114,112,1,0,0,90,17,115, ++ 117,112,112,111,114,116,101,100,95,108,111,97,100,101,114,115, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218, -+ 8,60,109,111,100,117,108,101,62,1,0,0,0,115,170,0, -+ 0,0,4,22,8,1,8,1,8,1,8,1,8,3,10,1, -+ 4,1,8,1,10,2,8,3,4,1,10,2,6,2,22,1, -+ 8,1,8,1,10,1,14,4,4,1,4,1,2,1,2,255, -+ 4,4,8,17,8,5,8,5,8,6,4,1,10,30,8,6, -+ 8,8,8,10,8,9,8,5,8,7,6,1,10,8,8,5, -+ 10,22,10,127,0,20,16,1,12,2,4,1,4,2,6,2, -+ 6,2,8,2,16,71,8,40,8,19,8,12,8,12,8,28, -+ 8,17,8,33,8,28,8,24,10,13,10,10,10,11,8,14, -+ 6,3,4,1,2,255,12,68,14,64,14,29,16,127,0,17, -+ 14,72,18,45,18,26,4,3,18,58,14,63,14,42,14,127, -+ 0,20,14,127,0,27,10,23,8,11,8,61, ++ 8,95,105,110,115,116,97,108,108,179,6,0,0,115,8,0, ++ 0,0,0,2,8,1,6,1,20,1,114,115,1,0,0,41, ++ 1,114,87,0,0,0,41,1,78,41,3,78,78,78,41,2, ++ 114,0,0,0,0,114,0,0,0,0,41,1,84,41,1,78, ++ 41,1,78,41,81,114,152,0,0,0,114,188,0,0,0,114, ++ 91,0,0,0,114,21,0,0,0,114,99,0,0,0,114,185, ++ 0,0,0,114,29,0,0,0,90,11,95,77,83,95,87,73, ++ 78,68,79,87,83,114,109,1,0,0,114,24,0,0,0,114, ++ 216,0,0,0,114,108,1,0,0,114,51,0,0,0,114,111, ++ 1,0,0,114,60,0,0,0,114,136,0,0,0,114,58,0, ++ 0,0,114,63,0,0,0,114,110,1,0,0,114,32,0,0, ++ 0,90,37,95,67,65,83,69,95,73,78,83,69,78,83,73, ++ 84,73,86,69,95,80,76,65,84,70,79,82,77,83,95,66, ++ 89,84,69,83,95,75,69,89,114,31,0,0,0,114,33,0, ++ 0,0,114,40,0,0,0,114,45,0,0,0,114,47,0,0, ++ 0,114,68,0,0,0,114,75,0,0,0,114,76,0,0,0, ++ 114,80,0,0,0,114,81,0,0,0,114,83,0,0,0,114, ++ 86,0,0,0,114,95,0,0,0,218,4,116,121,112,101,218, ++ 8,95,95,99,111,100,101,95,95,114,187,0,0,0,114,38, ++ 0,0,0,114,173,0,0,0,114,37,0,0,0,114,42,0, ++ 0,0,114,4,1,0,0,114,116,0,0,0,114,112,0,0, ++ 0,114,127,0,0,0,114,113,0,0,0,90,23,68,69,66, ++ 85,71,95,66,89,84,69,67,79,68,69,95,83,85,70,70, ++ 73,88,69,83,90,27,79,80,84,73,77,73,90,69,68,95, ++ 66,89,84,69,67,79,68,69,95,83,85,70,70,73,88,69, ++ 83,114,121,0,0,0,114,128,0,0,0,114,135,0,0,0, ++ 114,137,0,0,0,114,139,0,0,0,114,161,0,0,0,114, ++ 168,0,0,0,114,177,0,0,0,114,181,0,0,0,114,183, ++ 0,0,0,114,190,0,0,0,114,195,0,0,0,114,196,0, ++ 0,0,114,201,0,0,0,218,6,111,98,106,101,99,116,114, ++ 210,0,0,0,114,214,0,0,0,114,215,0,0,0,114,232, ++ 0,0,0,114,245,0,0,0,114,7,1,0,0,114,33,1, ++ 0,0,114,40,1,0,0,114,45,1,0,0,114,20,1,0, ++ 0,114,46,1,0,0,114,69,1,0,0,114,71,1,0,0, ++ 114,87,1,0,0,114,106,1,0,0,114,209,0,0,0,114, ++ 113,1,0,0,114,115,1,0,0,114,10,0,0,0,114,10, ++ 0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,60, ++ 109,111,100,117,108,101,62,1,0,0,0,115,170,0,0,0, ++ 4,22,8,1,8,1,8,1,8,1,8,3,10,1,4,1, ++ 8,1,10,2,8,3,4,1,10,2,6,2,22,1,8,1, ++ 8,1,10,1,14,4,4,1,4,1,2,1,2,255,4,4, ++ 8,17,8,5,8,5,8,6,4,1,10,30,8,6,8,8, ++ 8,10,8,9,8,5,8,7,6,1,10,8,8,5,10,22, ++ 10,127,0,20,16,1,12,2,4,1,4,2,6,2,6,2, ++ 8,2,16,71,8,40,8,19,8,12,8,12,8,28,8,17, ++ 8,33,8,28,8,24,10,13,10,10,10,11,8,14,6,3, ++ 4,1,2,255,12,68,14,64,14,29,16,127,0,17,14,72, ++ 18,45,18,26,4,3,18,58,14,69,14,42,14,127,0,23, ++ 14,127,0,27,10,23,8,11,8,61, }; -- 2.35.1 diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 73a0b6ca12..471fa8581f 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.10 -pkgrel=3 +pkgver=${_pybasever}.11 +pkgrel=2 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -161,24 +161,24 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0111-configure.ac-don-t-check-for-clock_-functions.patch 0112-expanduser-normpath-paths-coming-from-env-vars.patch 0113-Add-support-for-Windows-7-Python-3.9.patch - 0114-Commit-regenerated-importlib.patch - 0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch - 0116-decimal-backport-build-fixes.patch - 0117-smoketests-test-that-_decimal-exists.patch - 0118-Prefer-sysconfig.python_build.patch - 0119-distutils-remove-checks-for-ancient-gcc-binutils.patch - 0120-distutils-split-CC-env-var-before-passing-to-subproc.patch - 0121-_testconsole.c-Fix-casing-path-sep.patch - 0122-Return-consistent-architecture-markers-for-python-on.patch - 0123-distutils-add-back-gcc_version.patch - 0124-fix-mingw-cross-compiling-in-setup.py.patch - 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch - 0126-Fix-buffer-overflow-in-Py_GetSepW.patch - 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch - 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch - 0129-Use-CC-instead-of-cc.patch - 0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch - 0131-Avoid-using-sysconfig-in-site.py.patch) + 0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch + 0115-decimal-backport-build-fixes.patch + 0116-smoketests-test-that-_decimal-exists.patch + 0117-Prefer-sysconfig.python_build.patch + 0118-distutils-remove-checks-for-ancient-gcc-binutils.patch + 0119-distutils-split-CC-env-var-before-passing-to-subproc.patch + 0120-_testconsole.c-Fix-casing-path-sep.patch + 0121-Return-consistent-architecture-markers-for-python-on.patch + 0122-distutils-add-back-gcc_version.patch + 0123-fix-mingw-cross-compiling-in-setup.py.patch + 0124-Use-actions-setup-python-for-setting-up-correct-vers.patch + 0125-Fix-buffer-overflow-in-Py_GetSepW.patch + 0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch + 0127-handle-ncursesw-pkg-config-when-cross-compiling.patch + 0128-Use-CC-instead-of-cc.patch + 0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch + 0130-Avoid-using-sysconfig-in-site.py.patch + 0131-Commit-regenerated-importlib.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -305,24 +305,24 @@ prepare() { 0111-configure.ac-don-t-check-for-clock_-functions.patch \ 0112-expanduser-normpath-paths-coming-from-env-vars.patch \ 0113-Add-support-for-Windows-7-Python-3.9.patch \ - 0114-Commit-regenerated-importlib.patch \ - 0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch \ - 0116-decimal-backport-build-fixes.patch \ - 0117-smoketests-test-that-_decimal-exists.patch \ - 0118-Prefer-sysconfig.python_build.patch \ - 0119-distutils-remove-checks-for-ancient-gcc-binutils.patch \ - 0120-distutils-split-CC-env-var-before-passing-to-subproc.patch \ - 0121-_testconsole.c-Fix-casing-path-sep.patch \ - 0122-Return-consistent-architecture-markers-for-python-on.patch \ - 0123-distutils-add-back-gcc_version.patch \ - 0124-fix-mingw-cross-compiling-in-setup.py.patch \ - 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch \ - 0126-Fix-buffer-overflow-in-Py_GetSepW.patch \ - 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch \ - 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch \ - 0129-Use-CC-instead-of-cc.patch \ - 0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch \ - 0131-Avoid-using-sysconfig-in-site.py.patch + 0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch \ + 0115-decimal-backport-build-fixes.patch \ + 0116-smoketests-test-that-_decimal-exists.patch \ + 0117-Prefer-sysconfig.python_build.patch \ + 0118-distutils-remove-checks-for-ancient-gcc-binutils.patch \ + 0119-distutils-split-CC-env-var-before-passing-to-subproc.patch \ + 0120-_testconsole.c-Fix-casing-path-sep.patch \ + 0121-Return-consistent-architecture-markers-for-python-on.patch \ + 0122-distutils-add-back-gcc_version.patch \ + 0123-fix-mingw-cross-compiling-in-setup.py.patch \ + 0124-Use-actions-setup-python-for-setting-up-correct-vers.patch \ + 0125-Fix-buffer-overflow-in-Py_GetSepW.patch \ + 0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch \ + 0127-handle-ncursesw-pkg-config-when-cross-compiling.patch \ + 0128-Use-CC-instead-of-cc.patch \ + 0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch \ + 0130-Avoid-using-sysconfig-in-site.py.patch \ + 0131-Commit-regenerated-importlib.patch autoreconf -vfi } @@ -418,135 +418,135 @@ package() { fi } -sha256sums=('0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8' - 'd015c8f1b7782dd042d88790ac634c1ebb4283cf7110b17bbc883656d6059c09' - '18fabe1a590cb237c69adf7d40c5059c194bcf6ee7e6e46c9e395de1b42862d6' - '28cfc9c6f8568431a6e4362871d291c834154346e13100a09f7a834ac02ac934' - '18da18072809c9f2f4d40cb0f383a4ce03e5ee9e18271c3fb1fb59930d0dd68e' - 'd3fe7b376f947da94e2f483804a7237aa5d23f88af031bb0afe564e889e772c7' - '247be25ac1da1aa12a5ebed2a2bf84d069d07b1cd6bc19c9439e6e14beec23e5' - '13bb9c614812f41b9565479d0d4181b542edaf2ca0133e1fe47c964287978cce' - 'e289681d83688509f58f5584f676dd60480168b4ab28fe06b30dd678f5251c5a' - 'da18893625bf9505cc9ffec1fee8388acf53837aa029ffedd021e757e8f6ebdb' - 'b0065b6a77f99c465173e61da4dbb7c2d2204c7c8ea95feb7afbe7452a386b93' - 'eb35ba3f9f6427ae76d9235287244c6b66be0e4c2f47d678efd775f3987d27bc' - '1c95e8b11e8e9f5052300ae7a92cfcc5b76ef8f72bab5a207c331c90184bd8b7' - 'af5afb67ce5c01510b961d96a8990df533d6c7a04cd83e87c4f2e2abb3bb276f' - '227f4e10d65bf2bd6603d2552e741ed69ba15f54a7e95013c327d22033bac600' - '9a104481f1409088364912226e6d88d0c13f7f21315fd1831ea025ae1747c774' - '64fbca98ca973f0af1762080beb6d8be0bc54075edab4548694129522f9560aa' - 'a9a051a9186a1ce45ca48970dcc7fe09b518834acfad9a6edee6cc16b362d299' - 'a795304cef268c8c399a77d524b95cfb117e416832601348a34cb6ca7274a87b' - '5e8ab863e347f63d647427506192bb257547a16df9d9e30e31053a47800ea4c9' - '13f266905720b1d7ea4dbb7cf5f27d66ac6b98b7abff321394fca6f29a7fc24d' - '2f101a5b4187aca54ce7dce6b0e85ecde876391bf947b27afb33fe0cedc0185f' - '17c0841488e4d738ada5e9d41a90e136ebb5dc8a7f371af5efb3b81f149ce2e1' - '172f91ecafa543bf8658addf597b5cb09bc2cc14533f40eb44d474f3c48b6e1f' - '4e997d24b9316c92a88cfc12b9f2026699885d37ccc088b2b6c10d02e022ff0d' - '27ecb2622ba7c3f657fe2caa7608026d4c8f63e03d5ea25cfba593991add8aae' - '204068dadcd59c505c484930011615012294d4a09af23dc8b9825873aa0eb20c' - '5a162b6c1480edea61ec210ee6b5ac925de3c1c2c439f20aea7350f98f0d799a' - '150d4e66e96aafd8bae63892f29b0dec50ad49c5240b0a9bdbee1885b4aeb9e0' - '4684c16a7d1c801fb8af78a4876f81240477c2505881576e70f63a6f59126913' - '5451749a486473c61af78e50992d27d02d4daf24298102361cb81856f6350da9' - 'f88a5bf3aeb7b8c735b8b3aa5fb175595dbdba41b45a86de81f86348383b632a' - '70fda94e79237055b16f0bb92e0f3db7c3c270e1fd856f038f76751b8dd0badc' - 'e35941104c255b0eba67b56cfbbe820597a734c6f95e1e47dedd8ebd069d6a00' - 'd129bb499c2e85c88230031eec1bf49991886476f60f3fafaee64da74062a942' - '0055aef37cd6bede3dc1c4e3e813a1472388fff613363df29828788ee4d0e6e2' - 'd46807159a2ccca90d52b6017895f64ec87828889014bfd17a800635b757bfd2' - 'ee447eda2bd569ca251cbd6db8eb1e51a6033559b7d3776a616f414251b394fe' - '1e7ebe7c0b19560adcc74e874bcae51f1a36603226e2be4deed2d480bbd08394' - 'fc6a82de484864eed4d6665d2da8e67c8f00cb2099596ea728cfa3a6301a5b33' - '074fa533ee2fb39d37643d06f63d47edb686103b69c3b723c2517097f96229de' - '6941394f6a642a14c748e3b9f10845c84809536025c4f63d8ec0bf0990b72dbb' - 'b7dbcc7df5afe00fcac50297454821ecd11b989eca0346fe38163a7e234bb615' - 'd2b34e89e9d8ef866f2d72f96d70c166d2b2bd7b4cf2a7184f365bca2d5b555c' - 'bd3ac027feb83f48cfe79d8a733c81087d6b5bc1715b0a2aecfba5e87f14ee8d' - 'e3aa3f83dc29066f93728556a2300a6532e8c22f3b0181b26f23ffd7c5e1c0b8' - 'aa5069a15af381781ebf6d3cdd6cbdceeb73c68e0e93d8e6b8215603939770cb' - 'c5cc32739a04da625f6004130b8895e336c296adb0aae4df84dba43052cfbfc1' - '778cbde3c974788e28b052d760e6a0f2fa4bfb5278052249f6e0b50cc038f341' - 'a5740ca0866d5cea2f0c41243c993cd56992eaec7bef4814e855e41edc77b85e' - '81dcea28ea7caaa28eab6912e4b205986b39e05509dd06854bd0b51d1a5d414d' - 'ccb716bfa8d4f02acc47f0079a8ac1040011ffaa1463c222339434ff51f649d5' - '89151bdda848d1123530a4fb10d270edd8b84375e7bc601c0297661fe91ae6c2' - 'bebd4c117d73cbdceb75fdf1b4c79c21b441246bddfc13e3180b4a87f8142ca8' - '97fc7b8a06262743f823ad7d93374d2f0f37b0ca656ba519af9603857a789b5d' - '6572177ebe5dc25ce7e44b5ba0ee70a88c97ddb317a0798f01527b536f7ecf57' - '7f1b6b28204a68ba1f94090d0d99916b50513e622de3d57ec28d1d6db948722a' - '7e5bb71cd10a6811d879b476739a5cafeceb9462415bef589f3f472d8b10ca3e' - '7af77954afb59a30e6f7db996777c960e194296230507c2471b9f9f220e3bab9' - '2b6f55dc7ea548107dea1ee2a76348de0848cf7325ed992025fed1cb5c86c6f3' - 'd500c647342b9058cc1baefedbfea8734f57d9d6263c664ef27075463feb731d' - '40398e60afa57c9e6f8c1dd3057c92312b5acc922df138180a6b6c8a3f68eedf' - 'ab25090c8600b1c404db7127c44b7bb1d352586ecb3d7100785a93622cb31688' - 'd02d12eef13e81d0187ee7e59ea397045b27f5fe592ebe06af13c8c2a1160530' - '909a403767568b3738ef7ee1526b3795ae9a2a1f170d9642e2a05fe370dc1e46' - 'd9da3f41dafae6cfaa3fe7384b11d6eaf428efe5c00d0a2b71350b3beb713c73' - 'e4ab3b7242cfbe389c9258ab1fd4b9d7ad7644567a3320b87df01766e0212750' - 'd749504f525266e861cf99603d4e41e7fc3d61c58cb033604bbf3c7775b4cde7' - '4fc35baef4e9a6dbd39a2db5fb502ccfdb9cc831c5b2ba7971a0785531a03564' - '404c1f5f8c511bfe9140ae36785243bf1ef8d0d25ae8633d050d70ac15bc5d58' - '293c0b89ef7ab6cd2b33c560ee5a6f6640c3781b43edde76eca6be6da4143bec' - '09203c49c7265b9fc966c05094614064f2b93a8ccc3d036aa97b5e4a196b68b9' - '0ec32686b1e3be25dbdf38982efd5118d61c96fb13933b93d117fc2a2a1f04c7' - '42ee4135a2c499a43dcc3a04f4dde9cfc091b1e5947a10c19d8a70d0debef458' - 'fb03d7482d09e9dec1fce65e3355989a8d25b279da1b2637d354055fb8748eca' - 'f746e1af86e1ec4d81f05c5b0753c7d14d6bdd8ca3c5613bfa78b5c2f448c65c' - '71f7f195df7bacaccf9ab00edb84c70fa93b9cbb9895fe2fe5709bdc7645329e' - '8adba3232ac86417740f2b43c1d2e6558a5dfa43e148600d2b6c927d4de66e66' - '847b0a6fd389d2e1a43b13aae1f4dbc8d76997e19842f96201bb71ac2dff1f33' - '07b190fdc678695869892fb15129b47c1b82a39f57f4cab46c5e2a578e98b561' - 'babbe72530caad3a64c7a6db0417cadc1e77bc4b61882a5befcabe3f756200f7' - '7a508e44574faf505d2fb3379572537fdb2eb8c01e334a6cb1c9a9fd5edc5849' - '079c2ba1248ddcdad93f939d0286d281281526d7fc0b3fa33781fb4bdcb39541' - '97dcaff965fa7d1415e0dcf8c0f4859d4a0d9e8552bd931f24eb592f33b1335b' - 'ed5ff1d030841dcf6d08d354f40bbb83972c0a5925ec9d5aebea31f990981978' - 'fb548e8afa05537427d46c4bca7eeb10770b94864c9c2f4b111a5a189f33b834' - '403cf8f69605f2a8c13b91ca56c8ab77916c423a3d3ad8d2173891598785f6aa' - '9d96d38184caa6cf3c23ddc405d5d6c7341bfb49ecf6a52d75befb5d899635b3' - '4f0e1ca9f7d05fd0457414c455d0b3e5faefc4188069a62d93bb2b26ca127bac' - '0e3aa1aeb3aebd7c0df381688a86ec6b016a9f7b957bf2df0f96f80c3f713fa8' - '82cbfbaddb6b3650d0a0a02f9685053fc40471d9608d4a2d5aa92f396e007e76' - '088a59f677e868605777bc9d02fff43fccd1db046cee323b1f0ad03f12897c81' - 'f66c246ab93fc087f11197945261ffc052550bbefe555fb3c506999b2012257a' - 'c5b1e918d0c222afc3b36c2762e31fc51a4ff00932e42c92d006348b1f031e13' - '9040cbd793b537374041caafab4c1a0562644c25ff7b6403f74e00dfd9bcbe10' - '0cb11a19987c595f8476219bfc6bccc1a814ac1d8139422af48757d1f1aca975' - 'd3ddcf2fade8bdff6e3a1ad3197db3f9a10daa117529d3a88c9ca8da42fa67d0' - '0cef75f93fe668163b8952f98ca7296bfbb3477930308616810d564bb3f1cb97' - 'ac5bdfb8c32964e266556797a3745451647d7e71e2a3bb6c877cca0853b98d41' - '7133976e873a9f7e2f25a34a53330c724386c17dc8b9984261ff677d7bd212dc' - 'a8999b6526ffb8914122448c13430c75579815bc785270f04499e90dad72a779' - '6ed6b0129808a7af10ea457b31a8c09f6579ed9db9787e1ecf401e47185623bb' - '577648aa8d73488d772553527f6310040918ab72b7ee30583af0d597ed642bfa' - 'cac5ebf672a1c8597f11d5012a755460103aeb864cf57a2f183c33c2f0bef84f' - '0a477628e81a2d47e647a5b9acc3ef160081047fc059bb365f4f86090405135b' - '6a282238deae9ef72daf26a3b2f1731244c0f4649995ce9fee15769221eb4712' - 'ae350d25de5e4bb4c4a06d3d7e55d076f289abce832d7f788c320723f9f814ed' - '63f745a9f77cf3d36cff674da404d4a56858415ef507b7a5e62178957e52f243' - '8053e36b46b1422d5f0cbdecca22712424c1ca7392feb6fab825326196e437cf' - '8256a90d0da4722ce8003a8468478c7719d252feae23e24c03d996fdd5812925' - '58db4796361fb9fc77e9159d2fdb498e66e3240154bc88039a7aa9657c00addd' - '1ed043a52a04f6700ffcdc2552f8704ba8b6b2c70fe478f165d04ef2a36e0ad0' - '6d2874bdf6f95c4e11c8ffb195ad54181ab77a1d504c651905f8271e57eb7d6d' - '4ebe45ed2e86e11384919fbc4831d5518f4f6a44b68356a1e51f4d2fe6231916' - '3ea57370519ada05aaf15c8783a9774b91cf6612d7f1fc72979c91a96bc1e5c2' - '9e5b9263b10fc422b150e44f6f7136f567a9c56c07fd4b0c2f0423495e860566' - '3a5dd25c5ab4e9f0a4ca4b9008f80c7ae593a55e43661d04190bed329f57f0ef' - 'f0ba86d821a7abd4127a31249dced279428e01cec0a23fb6592a586ec1348f54' - '23fa4f0f7921bc42918e33f4ec7b976b7b4e99535c26face3d013513ff303a19' - '54a3f50ad08c40064eeb398e22abd013f3b66e3f78f5d5188e009a60d9eac420' - '41cf8644969b3a2b33882d4f881269442520ebf9e3e7a86ebbe771236394245b' - '141d3cd941c7a149f56f58eeae2ea78e745437d69dfdf967f277efa6fb32f532' - 'c90ac74aa7947902c10a1d89814b8c705ba3a2a63894540808fa92c431c16ec6' - 'd77435479ff22de154aed102584f775d19d19217b1476de311623b5de118c07a' - '92e0d5286a9194be9aab23dba1fce0864ae34951a40b8ebcabb80b06fbd8f0ed' - '0c671d5393c63c7ec764e463d458d0943dbe4e4d3fd0aac50cd6f5034e84c4df' - '104102255022be041a574bc4bd21f9775d3ad114d9c538de18d55722a721b164' - '7e13fadf84c25dcc83dd761f286fbed3b54b2d11b213667251b659d33e8c05f8' - 'e7205b266c68e581556b473f19f66e986adc946da8de98dd72adcaea936abed2' - 'd6420e7c9d3b0a70d961b42272ff5a13282f23426f9e52b865a806891a4691c4' - '30ee3b46a98ea4cde3e75409c28d398ece71b2c03628d90eb7fbe1ac7ad8106e' - '318bb96672c25459716d89481dd6dab9baa0f20cbf6df3e06faa63d1d9663815') +sha256sums=('66767a35309d724f370df9e503c172b4ee444f49d62b98bc4eca725123e26c49' + '14a749ffbf62f7938ad7b6b8cc27cb49ab60ea893ad9789194bbdb3e975f1be7' + 'f3c915d4ac67354fc4591b2b1b32404ae38f80e4dfd18b842cd1f758d148166b' + 'f686eb93aebdf41b4038113f90dec8100f8bf33d7bae7239979c644ac395c098' + '234fe5d89d9126a7e772f6f3ee51b8927aabb82f9cec7bc4be9e0c7a2bb4b38c' + '85e3124551921f768b830255343f1a77f7435808c137c9e7badd6ec80f268a99' + '62c8bdeeadcff23005bddaebfcbb117eee29cc7c8d1fecb313d3527d0d27f9d8' + '8138194f246de18213a36aa085a3eb6558d032f2e8126b093391c6d1068c704e' + '401ab82cc865c95eb1554129c0245679925598185ce7d18bee1caf0800b3c0b2' + '8f8034df21b5c5206dc56417d3014ef975ec1e3746baf8b7e1e752ad167ec3b8' + '68ed9d7127c9db0e7924813695c7cd7dfd6716fd30f2546428fb47792ae16327' + 'deed27b01e0ddf0f827cd616ad1a84d537bc60ef6d3c5bedec38a96579626e1f' + 'e12cc6b07d507814a2d65a20812e7106016aa7c281863f1a2c9a30b471f251eb' + 'bec2aede0a41a3c7bea6421582426bb1cb557f5665dbc32c6e25075106c26429' + '3609eb8fa3cefe0379058dfc1ed9125456b076afb383ba71773dbde99c7cfb64' + '79ba9064ec76616e691d01ba8a8f7ddf8eb391bfceaf8c99056ac9b38ef77f52' + '47d7a3252233fe4c93ce11b1559c779289eb63b9bd9c20fb3dcf49a84bfc066a' + 'd65b70b14ef8e2d214fb3c82035551856aa87dd57b9b77fdbd13ff1ed6977109' + '7c95384987414cb117eb9a31204d8c23c1ab4cd6085c311d18a7d6b818f5f5cd' + '9a4e152059d0607806b197af56d5e76430afb38297a8bd293b025ac09c727616' + '3668cf91e37847b83e28badd88ef9a5b480eda6391a0c5955a1eb256fed56b47' + '5f665b904db8ad057a0c1a4d90e3411a4db75f24cb8e4919f97a790ac0885efa' + 'fad32745e944b259e4188d648f7ded9c53b1e8ec8ca120b832fd86e8d0ab21ba' + 'c23bc6c927544e5323d2dfb7f3bb61303b7da38a96b292999922569aa3854626' + '6453f5cb70d356359747a5b2cffd19f6b6b6aa1e9f90ec6f42b37379bed089f3' + '2b69bd18c212dfc6324aa45ce1eb9fe5a995963225de6760f872d6bd95d0d1af' + '767e1aa308e249ad5fc83209a85083da690223dc6f7f7ca7755bca2fc44c4e9d' + 'e41c839b46998bda1053ae41e9d4ff8f42bcef2a8d00de9f4f54a157378aa385' + 'f213f9d562e58ffa9bf1eb9b462c29d2668ae31e005c679ab3c4df175132e422' + 'fd7af13b942906112d1f4bfc0ccc3d567072bbc34278f171c240f3b59d0848c7' + '3046aef92b342efc748ad57e3fdac327402dd7c525871dd515874cb3186bc01a' + '0356ff1b1a929a9cac5cd3e50ff71aa0149e009ecc4f1a2af8a36aa40a38e466' + 'c80368e65ac9b4a7ba7596be8ce52e2ebe25bd2acaa7f22213f11d312edcc5f1' + '2ea08fed96258198c3153139a5dfe3c3b07895cd604f6eee63459ce69c9c618a' + 'a27ec1890157e5e06a1b70fe8ba65297c8a7afc821892c399a1c13247a1cac9b' + '0e804987081c2bd5957de43dc5589386a0b8fdd9e5358b02acec3a236dd073cf' + '6a5a4a17fbebaf77e72dd5fe6ac913c44254bfc211a8dfb670b67b54b234b959' + '43302afe1c279dc5b57e9d8ebef31465d8c7573c79910b70829fcce61b6f7b6e' + '34fc9424368ebb884e5fb05b1311cf0266c158ec18968cddc2d8c1918b51fa31' + '921ee9d36673feef2ee83a11644ad7ad2d42d5175364433ed7d9706a787183a7' + '1b0389e46ff075223a4997766193423e218c6ee6852eaf9710d325d0008cdd86' + '33742cfc5f3023a82870088dd218ba5610c6e3dced04f074e2f236a05de2466d' + '45f1c3b4aa89f61e1a19db8bfbe56f255bbd2ac72a6314e07b3faebc3aa094c0' + '86d623dcf74992a459995e00720424dca5cc75abb4afd3799f3142ea04d24f24' + '8acc055168b39d642e16067472b62ff2c76f7b963ff5447a12a0b2b4d35a779a' + 'ddfd26278fe9f885ada67d690c9a88f6d12193c4c1528663d32ad9afac501513' + 'f37927f8a75f2657a653688cfb5e45af9d940cdd660ed9bb6f7c1c1a49d66195' + 'c08b648913a78fb5a4f79f650bb2211bc2c5d51729760d4d184c0e85ea95f028' + 'bcc65ccd04bff16ca2899f44a4426433c669dbf5af801e21799e2deb67bb0e91' + '1ee2398d930f3c2fccfd7921149d1213e1ac40f754f113b11ba6df7546619dc4' + '5b1861758b28cd2d6299491929ce079cb07e849cfb3ba56e1e02271624a650d7' + 'cf2b356399ecf49db665629a0f570f56a9edb012aba208343d49edecdb591550' + '8ab4e55e3e1184e29726cfc871ae92ee7132f5106bfdab3a8d7ee57c54adb6cd' + '9eda8629b8489f4654127888337886025fd930777e06a6dbeb31783e72b6faaa' + 'd262b297b2ddbe3bc06256d24f446bd5bcb2685ecd94c8d0393fdbef79ad1458' + '456f9e0eaf6e9753cc5c2b35eeb34a515beb71979666e1ad8e5bcec69a58f95d' + '3832af0787cf7a733752ab66510a9981429f4c8e5d7b686f0701d71dea6b05eb' + '3b57eb4e65a64fa4d09f0fb21099afbb1b1207590988738d9ae484f13cd24da3' + '7f799e8ee94018b8106bc094e27aa1f5019d6134d2e9f7b0cad358d63de52ede' + 'a3e66a70128f264e0ebad1686d205bae017da5af43eb6a76ba9bd65f2e7f48f1' + 'a870dd491c67337353e1db40d66be29cba219126f126be7f41fa5a254dd4fad4' + '5b40c4ef2567f4efad1b611b4a16a81e5a21eef99992a0732558e801a8902010' + '49ab79a0ea42a5e0f85ea3b9e882d5f7fb504b3c8abfb2c7032ffa4ec1c7ee55' + '323dd168cb4dae76cee09431117e9ae433c87de0aabd374ad297827317ecd166' + '99f50210bfb78cfd9808a69d08a5d1591200ca14969b512f9b4e98a430b34108' + '1b9c5a486e64259dce725e1c9ba81176fa1b0ed66205638ac90bcda7e4bd0f94' + 'cebee0fdded0aeb5bcd2dd2161220a313972ec741d1df4244c72edb363903147' + '297a7481eed78379e06e73d34318d4ad870f5e570c6f21d3fa66b74731c76e47' + '4d1bdf79df9ffe45ddba1fad74d47e7f0402dd7af7726a87b6f17db2761b1ce7' + '631d6817fc4bd9fc5434f04eb0696be8837566a137decb261bbebf0966f6c070' + 'fce9788862ed6a72634e6eb2dae8babf2a4e784a5d5827bb18e0ff0cc325037e' + '543a8cf68fe8de31e809796ef50faf2c2c2b9affe4ad83d9811eda00b5e130d8' + '4ffcb46b1effe5252edafb612e5ff79e0bf3a2f0d838d30190668475268ae1cb' + 'bcf5fcb0f3fee4eae5ab1e8af165da7ed8f8ba1f777243382f62ca3a75023c97' + 'd047528ff01646a909c968cac6bcdaecdedf24472c0cd516c4f7826973e51361' + 'cbb0e3ab10df655b5613d7878cdc66a9f705b09629d4ba7938ebbbcddd73db69' + '642f6bea45246fae0e60d41e63c32c70fe5e4c6b61a3a658299b6eadca8958bf' + '31e80c73c2cebe8a9a2dd6a5513a64e09d85f6e937551fe31ce542eb4bd5e58c' + '57e74f96722966414acf5d5a910ca9ddf34eb8ae9a80b024eaaaf0a4ac3e575e' + 'bc45165034108bf2efe2630ed947fd3c2be34f0bb27a90cfc0e9832265a0792c' + '710f5996fa7d4339d4ef41dd943af4a6dc46ee249c5a823cb3a74e48dfbc663a' + '98301a00057cf468fc25c6471b25070a30eb7bc847679b9bb74f48f39cb54d9b' + '0bf658c52b607b46f7973b68e6281b17869c98fd015448dd232049c468084645' + 'abf33c2bfe571c10485b9d5c4693dd4230e271882250825e36953618504fc542' + '5f51fee46da791b2ddc99fce0b6c6f9ab8623c4b438c9ba1845aaa350a9a83da' + 'fb1db31aac8d7d04b6bd795b0c775403cb5254568fbf7ef2c4258c7c65da8936' + '4c2845af8e21233bcedf957dd2ce61db5e4d0df9c858e1f8e372067c9cefdd93' + '696ad3460afda7a082a2d28f07754ed2728fd836d1630452a692e320ad6b2dda' + 'd7c21891764eaa94c189dfee764c26fa6964f76ef21ef7094914806c4a34e771' + 'f72584569ea1c6545e1cb5f27142b231b4b58f37de7c9dec3067708d00b7be9a' + '66cfe2ca27b793e149952fbdb7e2c756e23292f9d46f3482177a4a6086acea31' + '72b06e4dfa2eb331261cfa05d056bd0bc08b6760b32e2976ad9214050c6787d4' + 'b77b1905a095258e4b127a9b8e95caead5d56ffdd78dfddd1dc20b2d6e6dac9e' + 'e09b9d1a38f1e1dc0461317d7bd0744968d5a8e151bf8f68c57950c27b1c82c2' + '4b244d99a177bdfc1a7736c9668a280ba62e4724046981771b90633dcf580cda' + 'f90cccc7b175edbd49f9f133958ee58454ecabea3b2f3e40967884d41504b2e4' + 'd5f41cb453b8618f9e9296bea79494e6619ee968669c465c8faccde409124ee9' + 'ed045b5cd97db173f671af08633c67313c88dbf1a0ade9cf59eb1c3a67c3fa8c' + '6d77b25062b3cf9ad039b3f8596ad8bbbdf9c596b68e4853656d0bd866a93867' + '219fcb734fcb61a7f150cfe554fb90fbd87d358d32e699c0825558ab057e6534' + 'dce412e33761fc3d499d5895e238ba2ee1cde5015f52fd6a5d76aca4b0a1706a' + 'd1a335f6d041a7857b3359b67ce846cf5e7185323b8ee3f5ea97a5bd198e091c' + 'e0a0570d6e86aead9ff469e9a03cd7ee5867d159207e5fac9078122b2f9481b3' + '309f88ed6e1141bef6534643b705fb46e44a8fc83e6a9a8715b7db261e2bc355' + 'eb91aed55aae4a8025bd719cc6c89ce68a78abd215f44ab13cd3c56d1910f31e' + '02b2627ed0a1d15c7dfec8e884194b426bf04857731846d748779d2d60890c3c' + 'ceab444ffd44ec23426e03aa4e6eb2e3560f3d464a1b24dad5b4ea72e8e5b6d6' + '433f17dbe17eec49d81cc682b0ae2b55e3dc973ac519e2de7cd5ca985d62dbbf' + '3ca9b205abde5e7471d96868f283adc16631ff404d6dd3a1dc600678f9b99069' + '210e35732521462c1b7cd02bd70f3b3bfcf7ea18ebec77f8dbc81fe333655163' + '62c9b958b0e238a4f9e03dfd55726f10e571468450a445ba289889dc82d546a9' + 'b693738b865e21abac132170feb1b6cbd4d6cb91720f4ea2f878b31583c3f2de' + '753bdfef37ef99fab62eb6efec20339712ca94116885a6e6abb51b1b525e7d32' + 'cfecd98ad285d9205c7393194c5f18e8961e4e93d8a516a88a6fa6a9bf305a7e' + 'd44ccf94b9896cc20e5c2bd88821df193fddf60a173d0ca87ef72959e58fdb7f' + '571ea6e0336d74129057d50d5d1a65c09258cb4bbba9482cb0769edf39288f78' + 'a7e721c150601b58c2df7c555e615df4ccc421300fd441b69b77753060044d62' + '8a5e74d7465680077254a853fec40fb2d7e678ad26112e55bdcfee8e75b407ae' + '0b7d579cea65534a4ea6186350e2ffcc516dafdefe338e584d99233fd1285f84' + '50e58a3fe37d532a6be46966b298312fbec0a24ea3a8bab47fda61d844209950' + '40082fc50a66c23a1eef19d509992cbaeb545748bac8adde0f4fff7f4e84f9f2' + 'b53a1d7ff87c6acb07de4b2b9caea41e579fb493491258ccd118ca78f7d9eade' + 'db8520edb1013225b0b8a2a896b8fb554a12755065fe0f752004aa4dde1c0485' + '637bf002895d9505c275c7d7c668f43754d8b4e4061f794ccb750399c457ff7b' + '6d618d5017ef6455ff0fc9a1d161fa6a44f9f9f6ae25d47665110ebc5c3d6c12' + '30c0f1453b7e230db3623a5cc714c5849f087efdc862b57dc5318e8ef6bec13a' + 'fc1fa38d44660f0ee499172d4912825c24137d0fb00294c92004aee10d6caa78' + 'e341b7d562b3db13681af9d6d03c1645d182eb83bdc929cb12ea56922ccc12c9' + '0d840c8959567360976546b01e7c0949325ee00db760843fe2a75449423db990' + '9324668d2b915f6e261c864321b4f739d2bca0dec4ff9305b3a99c6c61b3a8bf' + 'ffa98d8b6e7538ab97297a49c39ab8bc7d7d9abf9fe318d398b2e68a0b3fbd90' + 'e8b39e114885e95af8da22e19272a1fc9a95d3f456a3b5c821b9611bfb220b55')