Mailman 3 April 2022 - Python-checkins

bpo-40280: Add --enable-wasm-dynamic-linking (GH-32253)
by tiran April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/c9844cb8aa9615cdc8770d1e43ce6e2ac3… commit: c9844cb8aa9615cdc8770d1e43ce6e2ac3efd836 branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-04-04T19:31:31+02:00 summary: bpo-40280: Add --enable-wasm-dynamic-linking (GH-32253) files: A Misc/NEWS.d/next/Build/2022-04-02-17-52-38.bpo-40280.U8Dd0H.rst M Doc/using/configure.rst M Tools/wasm/README.md M Tools/wasm/config.site-wasm32-emscripten M configure M configure.ac diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index debbee7117f58..b46157cc6ad59 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -52,11 +52,13 @@ General Options Set the Python executable suffix to *SUFFIX*. The default suffix is ``.exe`` on Windows and macOS (``python.exe`` - executable), ``.wasm`` on Emscripten (``python.wasm`` executable), and - an empty string on other platforms (``python`` executable). + executable), ``.js`` on Emscripten node, ``.html`` on Emscripten browser, + ``.wasm`` on WASI, and an empty string on other platforms (``python`` + executable). .. versionchanged:: 3.11 - The default suffix on Emscripten platform is ``.wasm``. + The default suffix on WASM platform is one of ``.js``, ``.html`` + or ``.wasm``. .. cmdoption:: --with-tzpath=<list of absolute paths separated by pathsep> @@ -141,6 +143,27 @@ General Options .. versionadded:: 3.11 +WebAssemby Options +------------------ + +.. cmdoption:: --with-emscripten-target=[browser|node] + + Set build flavor for ``wasm32-emscripten``. + + * ``browser`` (default): preload minimal stdlib, default MEMFS. + * ``node``: NODERAWFS and pthread support. + + .. versionadded:: 3.11 + +.. cmdoption:: --enable-wasm-dynamic-linking + + Turn on dynamic linking support for WASM. + + Dynamic linking enables ``dlopen``. File size of the executable + increases due to limited dead code elimination and additional features. + + .. versionadded:: 3.11 + Install Options --------------- diff --git a/Misc/NEWS.d/next/Build/2022-04-02-17-52-38.bpo-40280.U8Dd0H.rst b/Misc/NEWS.d/next/Build/2022-04-02-17-52-38.bpo-40280.U8Dd0H.rst new file mode 100644 index 0000000000000..74fe5c7e49b4a --- /dev/null +++ b/Misc/NEWS.d/next/Build/2022-04-02-17-52-38.bpo-40280.U8Dd0H.rst @@ -0,0 +1,2 @@ +Add configure option :option:`--enable-wasm-dynamic-linking` to enable +``dlopen`` and MAIN_MODULE / SIDE_MODULE on ``wasm32-emscripten``. diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md index 1cdaa4efffb89..6b1e7b03df1e1 100644 --- a/Tools/wasm/README.md +++ b/Tools/wasm/README.md @@ -81,24 +81,31 @@ node --experimental-wasm-threads --experimental-wasm-bulk-memory builddir/emscri ## wasm32-emscripten limitations and issues +- Heap and stack are limited. - Most stdlib modules with a dependency on external libraries are missing: ``ctypes``, ``readline``, ``sqlite3``, ``ssl``, and more. - Shared extension modules are not implemented yet. All extension modules are statically linked into the main binary. + The experimental configure option ``--enable-wasm-dynamic-linking`` enables + dynamic extensions. - Processes are not supported. System calls like fork, popen, and subprocess fail with ``ENOSYS`` or ``ENOSUP``. +- Only ``AF_INET`` and ``AF_INET6`` with ``SOCK_STREAM`` (TCP) or + ``SOCK_DGRAM`` (UDP) are available. ``AF_UNIX`` is not supported. +- ``socketpair`` does not work. - Blocking sockets are not available and non-blocking sockets don't work correctly, e.g. ``socket.accept`` crashes the runtime. ``gethostbyname`` does not resolve to a real IP address. IPv6 is not available. - The ``select`` module is limited. ``select.select()`` crashes the runtime due to lack of exectfd support. -- The ``*at`` variants of functions (e.g. ``openat``) are not available. - The ``dir_fd`` argument of *os* module functions can't be used. - Signal support is limited. ``signal.alarm``, ``itimer``, ``sigaction`` are not available or do not work correctly. ``SIGTERM`` exits the runtime. - Most user, group, and permission related function and modules are not supported or don't work as expected, e.g.``pwd`` module, ``grp`` module, - ``os.setgroups``, ``os.chown``, and so on. + ``os.setgroups``, ``os.chown``, and so on. ``lchown`` and `lchmod`` are + not available. +- ``umask`` is a no-op. +- hard links (``os.link``) are not supported. - Offset and iovec I/O functions (e.g. ``os.pread``, ``os.preadv``) are not available. - ``os.mknod`` and ``os.mkfifo`` @@ -108,17 +115,9 @@ node --experimental-wasm-threads --experimental-wasm-bulk-memory builddir/emscri - ``mmap`` module is unstable. flush (``msync``) can crash the runtime. - Resource-related functions like ``os.nice`` and most functions of the ``resource`` module are not available. -- Some time and datetime features are broken. ``strftime`` and ``strptime`` - have known bugs, e.g. - [%% quoting](https://github.com/emscripten-core/emscripten/issues/16155), - [%U off-by-one](https://github.com/emscripten-core/emscripten/issues/16156). - Extended glibc formatting features are not available. +- glibc extensions for date and time formatting are not available. - ``locales`` module is affected by musl libc issues, [bpo-46390](https://bugs.python.org/issue46390). -- ``uuid`` module is affected by - [memory leak](https://github.com/emscripten-core/emscripten/issues/16081) - and crasher in Emscripten's ``freeaddrinfo``, -- Recursive ``glob`` leaks file descriptors. - Python's object allocator ``obmalloc`` is disabled by default. - ``ensurepip`` is not available. diff --git a/Tools/wasm/config.site-wasm32-emscripten b/Tools/wasm/config.site-wasm32-emscripten index 60ede49eb3745..33636648eaa52 100644 --- a/Tools/wasm/config.site-wasm32-emscripten +++ b/Tools/wasm/config.site-wasm32-emscripten @@ -91,7 +91,3 @@ ac_cv_func_linkat=no # alarm signal is not delivered, may need a callback into the event loop? ac_cv_func_alarm=no - -# To use dlopen, you need to use Emscripten's linking support, -# see https://emscripten.org/docs/compiling/Dynamic-Linking.html -ac_cv_func_dlopen=no diff --git a/configure b/configure index a06d4c9b41d88..72d88806190e7 100755 --- a/configure +++ b/configure @@ -1017,6 +1017,7 @@ with_framework_name enable_framework with_cxx_main with_emscripten_target +enable_wasm_dynamic_linking with_suffix enable_shared with_static_libpython @@ -1730,6 +1731,9 @@ Optional Features: Unix install. optional INSTALLDIR specifies the installation path. see Mac/README.rst (default is no) + --enable-wasm-dynamic-linking + Enable dynamic linking support for WebAssembly + (default is no) --enable-shared enable building a shared Python library (default is no) --enable-profiling enable C-level code profiling with gprof (default is @@ -6290,6 +6294,30 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_emscripten_target" >&5 $as_echo "$ac_sys_emscripten_target" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-wasm-dynamic-linking" >&5 +$as_echo_n "checking for --enable-wasm-dynamic-linking... " >&6; } +# Check whether --enable-wasm-dynamic-linking was given. +if test "${enable_wasm_dynamic_linking+set}" = set; then : + enableval=$enable_wasm_dynamic_linking; + case $ac_sys_system in #( + Emscripten) : + ;; #( + WASI) : + as_fn_error $? "WASI dynamic linking is not implemented yet." "$LINENO" 5 ;; #( + *) : + as_fn_error $? "--enable-wasm-dynamic-linking only applies to Emscripten and WASI" "$LINENO" 5 + ;; +esac + +else + + enable_wasm_dynamic_linking=missing + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_wasm_dynamic_linking" >&5 +$as_echo "$enable_wasm_dynamic_linking" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-suffix" >&5 $as_echo_n "checking for --with-suffix... " >&6; } @@ -7760,18 +7788,20 @@ then fi # WASM flags -# TODO: Add -s MAIN_MODULE=2 for dlopen() support. -# The option disables code elimination, which increases code size of main -# binary. All objects must be built with -fPIC. case $ac_sys_system/$ac_sys_emscripten_target in #( Emscripten/browser*) : - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ALLOW_MEMORY_GROWTH=1" - LINKFORSHARED="--preload-file \$(WASM_ASSETS_DIR)" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1" + LINKFORSHARED="--preload-file=\$(WASM_ASSETS_DIR)" + if test "x$enable_wasm_dynamic_linking" = xyes; then : + + as_fn_append LINKFORSHARED " -sMAIN_MODULE=1" + +fi WASM_ASSETS_DIR=".\$(prefix)" WASM_STDLIB="\$(WASM_ASSETS_DIR)/local/lib/python\$(VERSION)/os.py" if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "browser-debug"; then - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1" LINKFORSHARED="$LINKFORSHARED -gsource-map --emit-symbol-map" else LINKFORSHARED="$LINKFORSHARED -O2 -g0" @@ -7779,11 +7809,16 @@ case $ac_sys_system/$ac_sys_emscripten_target in #( ;; #( Emscripten/node*) : - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s USE_PTHREADS=1" - LINKFORSHARED="-s PROXY_TO_PTHREAD=1 -s EXIT_RUNTIME=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1 -sNODERAWFS=1 -sUSE_PTHREADS=1" + LINKFORSHARED="-sPROXY_TO_PTHREAD=1 -sEXIT_RUNTIME=1" + if test "x$enable_wasm_dynamic_linking" = xyes; then : + + as_fn_append LINKFORSHARED " -sMAIN_MODULE=1" + +fi CFLAGS_NODIST="$CFLAGS_NODIST -pthread" if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "node-debug"; then - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1" LINKFORSHARED="$LINKFORSHARED -gseparate-dwarf --emit-symbol-map" else LINKFORSHARED="$LINKFORSHARED -O2 -g0" @@ -7808,6 +7843,18 @@ $as_echo "#define _WASI_EMULATED_PROCESS_CLOCKS 1" >>confdefs.h ;; esac +case $enable_wasm_dynamic_linking in #( + yes) : + ac_cv_func_dlopen=yes ;; #( + no) : + ac_cv_func_dlopen=no ;; #( + missing) : + + ;; #( + *) : + ;; +esac + @@ -10469,10 +10516,6 @@ then Linux*|GNU*|QNX*|VxWorks*|Haiku*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; - Emscripten*) - LDSHARED='$(CC) -shared -s SIDE_MODULE=1' - LDCXXSHARED='$(CXX) -shared -s SIDE_MODULE=1' - ;; FreeBSD*) if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] then @@ -10511,16 +10554,32 @@ then SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport' LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';; + WASI*) + if test "x$enable_wasm_dynamic_linking" = xyes; then : + + +fi;; CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base" LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac fi + +if test "$enable_wasm_dynamic_linking" = "yes" -a "$ac_sys_system" = "Emscripten"; then + BLDSHARED='$(CC) -shared -sSIDE_MODULE=1 -sWASM=1' +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDSHARED" >&5 $as_echo "$LDSHARED" >&6; } LDCXXSHARED=${LDCXXSHARED-$LDSHARED} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking BLDSHARED flags" >&5 +$as_echo_n "checking BLDSHARED flags... " >&6; } BLDSHARED=${BLDSHARED-$LDSHARED} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLDSHARED" >&5 +$as_echo "$BLDSHARED" >&6; } + # CCSHARED are the C *flags* used to create objects to go into a shared # library (module) -- this is only needed for a few systems { $as_echo "$as_me:${as_lineno-$LINENO}: checking CCSHARED" >&5 @@ -10540,6 +10599,12 @@ then fi;; Linux-android*) ;; Linux*|GNU*) CCSHARED="-fPIC";; + Emscripten*|WASI*) + if test "x$enable_wasm_dynamic_linking" = xyes; then : + + CCSHARED="-fPIC" + +fi;; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; Haiku*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) @@ -10647,6 +10712,13 @@ then CFLAGSFORSHARED='$(CCSHARED)' esac fi + +if test "x$enable_wasm_dynamic_linking" = xyes; then : + + CFLAGSFORSHARED='$(CCSHARED)' + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGSFORSHARED" >&5 $as_echo "$CFLAGSFORSHARED" >&6; } @@ -15379,7 +15451,8 @@ $as_echo "yes" >&6; } fi if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then - ZLIB_LIBS="-s USE_ZLIB=1" + ZLIB_CFLAGS="-sUSE_ZLIB=1" + ZLIB_LIBS="-sUSE_ZLIB=1" fi if test "x$have_zlib" = xyes; then : @@ -15612,7 +15685,8 @@ $as_echo "yes" >&6; } fi if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then - BZIP2_LIBS="-s USE_BZIP2=1" + BZIP2_CFLAGS="-sUSE_BZIP2=1" + BZIP2_LIBS="-sUSE_BZIP2=1" fi diff --git a/configure.ac b/configure.ac index abcd379d705fb..fda231214b3f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,6 +1107,25 @@ dnl are free to remove them in the future. ]) AC_MSG_RESULT([$ac_sys_emscripten_target]) +dnl On Emscripten dlopen() requires -s MAIN_MODULE and -fPIC. The flags +dnl disables dead code elimination and increases the size of the WASM module +dnl by about 1.5 to 2MB. MAIN_MODULE defines __wasm_mutable_globals__. +dnl See https://emscripten.org/docs/compiling/Dynamic-Linking.html +AC_MSG_CHECKING([for --enable-wasm-dynamic-linking]) +AC_ARG_ENABLE([wasm-dynamic-linking], + [AS_HELP_STRING([--enable-wasm-dynamic-linking], + [Enable dynamic linking support for WebAssembly (default is no)])], +[ + AS_CASE([$ac_sys_system], + [Emscripten], [], + [WASI], [AC_MSG_ERROR([WASI dynamic linking is not implemented yet.])], + [AC_MSG_ERROR([--enable-wasm-dynamic-linking only applies to Emscripten and WASI])] + ) +], [ + enable_wasm_dynamic_linking=missing +]) +AC_MSG_RESULT([$enable_wasm_dynamic_linking]) + AC_MSG_CHECKING([for --with-suffix]) AC_ARG_WITH([suffix], [AS_HELP_STRING([--with-suffix=SUFFIX], [set executable suffix to SUFFIX (default is empty, yes is mapped to '.exe')])], @@ -1890,29 +1909,32 @@ then fi # WASM flags -# TODO: Add -s MAIN_MODULE=2 for dlopen() support. -# The option disables code elimination, which increases code size of main -# binary. All objects must be built with -fPIC. AS_CASE([$ac_sys_system/$ac_sys_emscripten_target], [Emscripten/browser*], [ - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ALLOW_MEMORY_GROWTH=1" - LINKFORSHARED="--preload-file \$(WASM_ASSETS_DIR)" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1" + LINKFORSHARED="--preload-file=\$(WASM_ASSETS_DIR)" + AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ + AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE=1"]) + ]) WASM_ASSETS_DIR=".\$(prefix)" WASM_STDLIB="\$(WASM_ASSETS_DIR)/local/lib/python\$(VERSION)/os.py" dnl separate-dwarf does not seem to work in Chrome DevTools Support. if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "browser-debug"; then - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1" LINKFORSHARED="$LINKFORSHARED -gsource-map --emit-symbol-map" else LINKFORSHARED="$LINKFORSHARED -O2 -g0" fi ], [Emscripten/node*], [ - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s USE_PTHREADS=1" - LINKFORSHARED="-s PROXY_TO_PTHREAD=1 -s EXIT_RUNTIME=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1 -sNODERAWFS=1 -sUSE_PTHREADS=1" + LINKFORSHARED="-sPROXY_TO_PTHREAD=1 -sEXIT_RUNTIME=1" + AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ + AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE=1"]) + ]) CFLAGS_NODIST="$CFLAGS_NODIST -pthread" if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "node-debug"; then - LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1" + LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1" LINKFORSHARED="$LINKFORSHARED -gseparate-dwarf --emit-symbol-map" else LINKFORSHARED="$LINKFORSHARED -O2 -g0" @@ -1927,6 +1949,12 @@ AS_CASE([$ac_sys_system/$ac_sys_emscripten_target], ] ) +AS_CASE([$enable_wasm_dynamic_linking], + [yes], [ac_cv_func_dlopen=yes], + [no], [ac_cv_func_dlopen=no], + [missing], [] +) + AC_SUBST(BASECFLAGS) AC_SUBST(CFLAGS_NODIST) AC_SUBST(LDFLAGS_NODIST) @@ -2929,10 +2957,6 @@ then Linux*|GNU*|QNX*|VxWorks*|Haiku*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; - Emscripten*) - LDSHARED='$(CC) -shared -s SIDE_MODULE=1' - LDCXXSHARED='$(CXX) -shared -s SIDE_MODULE=1' - ;; FreeBSD*) if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] then @@ -2971,15 +2995,30 @@ then SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport' LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';; + WASI*) + AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ + dnl not iplemented yet + ]);; CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base" LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac fi + +dnl Emscripten's emconfigure sets LDSHARED. Set BLDSHARED outside the +dnl test -z $LDSHARED block to configure BLDSHARED for side module support. +if test "$enable_wasm_dynamic_linking" = "yes" -a "$ac_sys_system" = "Emscripten"; then + BLDSHARED='$(CC) -shared -sSIDE_MODULE=1 -sWASM=1' +fi + AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} + +AC_MSG_CHECKING([BLDSHARED flags]) BLDSHARED=${BLDSHARED-$LDSHARED} +AC_MSG_RESULT([$BLDSHARED]) + # CCSHARED are the C *flags* used to create objects to go into a shared # library (module) -- this is only needed for a few systems AC_MSG_CHECKING(CCSHARED) @@ -2998,6 +3037,10 @@ then fi;; Linux-android*) ;; Linux*|GNU*) CCSHARED="-fPIC";; + Emscripten*|WASI*) + AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ + CCSHARED="-fPIC" + ]);; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; Haiku*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) @@ -3099,6 +3142,12 @@ then CFLAGSFORSHARED='$(CCSHARED)' esac fi + +dnl WASM dynamic linking requires -fPIC. +AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ + CFLAGSFORSHARED='$(CCSHARED)' +]) + AC_MSG_RESULT($CFLAGSFORSHARED) # SHLIBS are libraries (except -lc and -lm) to link to the python shared @@ -4460,7 +4509,8 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [ ]) if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then - ZLIB_LIBS="-s USE_ZLIB=1" + ZLIB_CFLAGS="-sUSE_ZLIB=1" + ZLIB_LIBS="-sUSE_ZLIB=1" fi dnl binascii can use zlib for optimized crc32. @@ -4482,7 +4532,8 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [ ]) if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then - BZIP2_LIBS="-s USE_BZIP2=1" + BZIP2_CFLAGS="-sUSE_BZIP2=1" + BZIP2_LIBS="-sUSE_BZIP2=1" fi

1 0

bpo-46484:Add test for Calendar.iterweekdays (GH-30825)
by iritkatriel April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/48269ea9fdbc5804f80962364f95e69097… commit: 48269ea9fdbc5804f80962364f95e69097c417ba branch: main author: 180909 <734461790(a)qq.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2022-04-04T18:16:56+01:00 summary: bpo-46484:Add test for Calendar.iterweekdays (GH-30825) files: M Lib/test/test_calendar.py M Misc/ACKS diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index e6bd4d03e0f63..f76cbc9472a6e 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -619,6 +619,14 @@ def test_itermonthdays2(self): self.assertEqual(days[0][1], firstweekday) self.assertEqual(days[-1][1], (firstweekday - 1) % 7) + def test_iterweekdays(self): + week0 = list(range(7)) + for firstweekday in range(7): + cal = calendar.Calendar(firstweekday) + week = list(cal.iterweekdays()) + expected = week0[firstweekday:] + week0[:firstweekday] + self.assertEqual(week, expected) + class MonthCalendarTestCase(unittest.TestCase): def setUp(self): diff --git a/Misc/ACKS b/Misc/ACKS index 72e2cfe13775a..33e1c4c492983 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1886,6 +1886,7 @@ Jacob Walls Kevin Walzer Rodrigo Steinmuller Wanderley Dingyuan Wang +Jiahua Wang Ke Wang Liang-Bo Wang Greg Ward

1 0

bpo-47208: Allow vendors to override CTYPES_MAX_ARGCOUNT (GH-32297)
by tiran April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/d1b1c885d8f276a0b1ff2e327270916396… commit: d1b1c885d8f276a0b1ff2e327270916396a8b842 branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-04-04T19:13:42+02:00 summary: bpo-47208: Allow vendors to override CTYPES_MAX_ARGCOUNT (GH-32297) files: A Misc/NEWS.d/next/Library/2022-04-04-08-54-31.bpo-47208.cOh9xZ.rst M Lib/ctypes/test/test_callbacks.py M Modules/_ctypes/_ctypes.c M Modules/_ctypes/ctypes.h diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py index 5561ffefe12f7..1099cf9a69c6b 100644 --- a/Lib/ctypes/test/test_callbacks.py +++ b/Lib/ctypes/test/test_callbacks.py @@ -4,6 +4,7 @@ from ctypes import * from ctypes.test import need_symbol +from _ctypes import CTYPES_MAX_ARGCOUNT import _ctypes_test class Callbacks(unittest.TestCase): @@ -293,8 +294,6 @@ def test_callback_too_many_args(self): def func(*args): return len(args) - CTYPES_MAX_ARGCOUNT = 1024 - # valid call with nargs <= CTYPES_MAX_ARGCOUNT proto = CFUNCTYPE(c_int, *(c_int,) * CTYPES_MAX_ARGCOUNT) cb = proto(func) diff --git a/Misc/NEWS.d/next/Library/2022-04-04-08-54-31.bpo-47208.cOh9xZ.rst b/Misc/NEWS.d/next/Library/2022-04-04-08-54-31.bpo-47208.cOh9xZ.rst new file mode 100644 index 0000000000000..a5da321f77a6a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-04-04-08-54-31.bpo-47208.cOh9xZ.rst @@ -0,0 +1 @@ +Allow vendors to override :const:`CTYPES_MAX_ARGCOUNT`. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 9177225f3f929..0415923694129 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -5781,6 +5781,7 @@ _ctypes_add_objects(PyObject *mod) #endif MOD_ADD("RTLD_LOCAL", PyLong_FromLong(RTLD_LOCAL)); MOD_ADD("RTLD_GLOBAL", PyLong_FromLong(RTLD_GLOBAL)); + MOD_ADD("CTYPES_MAX_ARGCOUNT", PyLong_FromLong(CTYPES_MAX_ARGCOUNT)); MOD_ADD("ArgumentError", Py_NewRef(PyExc_ArgError)); return 0; #undef MOD_ADD diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index 0badb48b2a410..da1941caf3927 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -18,7 +18,9 @@ * This limit is enforced for the `alloca()` call in `_ctypes_callproc`, * to avoid allocating a massive buffer on the stack. */ -#define CTYPES_MAX_ARGCOUNT 1024 +#ifndef CTYPES_MAX_ARGCOUNT + #define CTYPES_MAX_ARGCOUNT 1024 +#endif typedef struct tagPyCArgObject PyCArgObject; typedef struct tagCDataObject CDataObject;

1 0

Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383)
by miss-islington April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/a8f29b887e1d8212398508836bf6aaf81d… commit: a8f29b887e1d8212398508836bf6aaf81dc4f149 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-04-04T09:02:23-07:00 summary: Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383) (cherry picked from commit 1ecfe3d5ae4ddec4e73a6cfc93fed6df43fe0be5) Co-authored-by: Christian Clauss <cclauss(a)me.com> files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index be21b55fe801f..f5f33b917a481 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -716,6 +716,12 @@ If you see the following error, you do not have the launcher installed: Per-user installations of Python do not add the launcher to :envvar:`PATH` unless the option was selected on installation. +:: + + py --list + +You should see the currently installed versions of Python. + Virtual environments ^^^^^^^^^^^^^^^^^^^^

1 0

Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383)
by miss-islington April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/29ffac2d39f7e45834880e359e1bda9a41… commit: 29ffac2d39f7e45834880e359e1bda9a4152f016 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-04-04T08:58:44-07:00 summary: Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383) (cherry picked from commit 1ecfe3d5ae4ddec4e73a6cfc93fed6df43fe0be5) Co-authored-by: Christian Clauss <cclauss(a)me.com> files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index cad7f69806d03..2c348aff12a62 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -710,6 +710,12 @@ If you see the following error, you do not have the launcher installed: Per-user installations of Python do not add the launcher to :envvar:`PATH` unless the option was selected on installation. +:: + + py --list + +You should see the currently installed versions of Python. + Virtual environments ^^^^^^^^^^^^^^^^^^^^

1 0

Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383)
by zooba April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/1ecfe3d5ae4ddec4e73a6cfc93fed6df43… commit: 1ecfe3d5ae4ddec4e73a6cfc93fed6df43fe0be5 branch: main author: Christian Clauss <cclauss(a)me.com> committer: zooba <steve.dower(a)microsoft.com> date: 2022-04-04T16:35:51+01:00 summary: Demonstrate `py --list` in the quickstart section of the Windows doc page (GH-29383) files: M Doc/using/windows.rst diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 7e7be63d7da39..83eee281d4e5c 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -714,6 +714,12 @@ If you see the following error, you do not have the launcher installed: Per-user installations of Python do not add the launcher to :envvar:`PATH` unless the option was selected on installation. +:: + + py --list + +You should see the currently installed versions of Python. + Virtual environments ^^^^^^^^^^^^^^^^^^^^

1 0

Revert "bpo-44800: Document internal frame naming conventions (GH-32281)" (#32301)
by markshannon April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/8a349eb30b54bab9a7146fc10e3379c3ca… commit: 8a349eb30b54bab9a7146fc10e3379c3cacaa19e branch: main author: Mark Shannon <mark(a)hotpy.org> committer: markshannon <mark(a)hotpy.org> date: 2022-04-04T15:09:40+01:00 summary: Revert "bpo-44800: Document internal frame naming conventions (GH-32281)" (#32301) This reverts commit 124227c95f310d2ecd4b567271ab1919fc7000cb. files: M Include/internal/pycore_frame.h diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h index 3ea538ccc5500..211831a6e497f 100644 --- a/Include/internal/pycore_frame.h +++ b/Include/internal/pycore_frame.h @@ -7,75 +7,6 @@ extern "C" { #include <stdbool.h> #include <stddef.h> -/* Starting in CPython 3.11, CPython separates the frame state between the - * full frame objects exposed by the Python and C runtime state introspection - * APIs, and internal lighter weight interpreter frames, which are simple C - * structures owned by either the interpreter eval loop (while executing - * ordinary functions), by a generator or coroutine object (for frames that - * are able to be suspended), or by their corresponding full frame object (if - * a state instrospection API has been invoked and the full frame object has - * taken responsibility for the lifecycle of the interpreter frame). - * - * This split storage eliminates a lot of allocation and deallocation of full - * Python objects during code execution, providing a significant speed gain - * over the previous approach of using full Python objects for both - * introspection and code execution. - * - * Struct names: - * - * * PyFrameObject: the full Python frame object - * * _PyInterpreterFrame: the lightweight frame struct used by the eval loop - * * _PyCFrame: a struct that lives on the C stack and allows Python level - * recursive evaluation to be decoupled from recursive C level invocation - * of the bytecode eval loop - * * See pystate.h for more details on this struct - * - * Field naming conventions: - * - * * full frame object fields have an "f_*" (or "_f_*") prefix - * * new interpreter frame fields have no prefix - * * Several interpreter frame fields have the "f_*" prefix as a result of - * trying to keep diffs as small as was feasible when splitting the original - * frame struct definition in two. The following are all interpreter frame - * fields, NOT full frame object fields: - * * f_func - * * f_globals - * * f_builtins - * * f_locals - * * f_code - * * f_lasti - * * f_state - * * Renaming those fields was considered but ultimately deemed too disruptive - * to key third party projects that were trying to keep up with the Python - * 3.11 code evaluation changes during the alpha release cycle - * (see bpo-44800 for details) - * - * Naming conventions for local variables, function parameters and fields in other structs: - * - * * "frame" and "f" may refer to either full frame objects or interpreter frames - * * the context of use or the field naming conventions usually make the - * type being referenced unambiguous in code reviews - * * the following alternative names are used when more clarity is needed: - * * full frame objects: "frame_obj" (and variants like "frameobj" or "fobj") - * * interpreter frame structs: "frame_data" or "iframe" - * * "current frame" should NOT be abbreviated as "cframe", as the latter now - * typically refers to _PyCFrame structs - * - * Function/macro parameter types: - * - * * "PyFrame_*" functions and other public C API functions that relate to - * frames accept full frame object pointers - * * "_PyFrame_*" functions and other private C API functions that relate to - * frames accept either full frame object or interpreter frame pointers. - * Check the specific function signatures for details. - * - * Function return types: - * - * * Public C API functions will only ever return full frame object pointers - * * Private C API functions with an underscore prefix may return interpreter - * frame pointers instead. Check the specific function signatures for details. - */ - struct _frame { PyObject_HEAD PyFrameObject *f_back; /* previous frame, or NULL */

1 0

bpo-47152: Remove unused import in re (GH-32298)
by serhiy-storchaka April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/ff2cf1d7d5fb25224f3ff2e0c678d36f78… commit: ff2cf1d7d5fb25224f3ff2e0c678d36f78e1f3cb branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2022-04-04T12:00:53+03:00 summary: bpo-47152: Remove unused import in re (GH-32298) files: M Lib/re/__init__.py diff --git a/Lib/re/__init__.py b/Lib/re/__init__.py index c47a2650e32f5..b887722bbb2cd 100644 --- a/Lib/re/__init__.py +++ b/Lib/re/__init__.py @@ -124,10 +124,6 @@ import enum from . import _compiler, _parser import functools -try: - import _locale -except ImportError: - _locale = None # public symbols

1 0

bpo-47152: Move sources of the _sre module into a subdirectory (GH-32290)
by serhiy-storchaka April 4, 2022

April 4, 2022

https://github.com/python/cpython/commit/1578f06c1c69fbbb942b90bfbacd512784… commit: 1578f06c1c69fbbb942b90bfbacd512784b599fa branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2022-04-04T10:53:26+03:00 summary: bpo-47152: Move sources of the _sre module into a subdirectory (GH-32290) files: A Modules/_sre/clinic/sre.c.h A Modules/_sre/sre.c A Modules/_sre/sre.h A Modules/_sre/sre_constants.h A Modules/_sre/sre_lib.h D Modules/_sre.c D Modules/clinic/_sre.c.h D Modules/sre.h D Modules/sre_constants.h D Modules/sre_lib.h M Lib/re/_constants.py M Makefile.pre.in M Modules/Setup.bootstrap.in M PCbuild/pythoncore.vcxproj M PCbuild/pythoncore.vcxproj.filters M Tools/c-analyzer/cpython/_parser.py M configure M configure.ac diff --git a/Lib/re/_constants.py b/Lib/re/_constants.py index 5317fd53e9c5a..327ba548118b3 100644 --- a/Lib/re/_constants.py +++ b/Lib/re/_constants.py @@ -234,7 +234,7 @@ def dump(f, d, prefix): * * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. * - * See the _sre.c file for information on usage and redistribution. + * See the sre.c file for information on usage and redistribution. */ """) diff --git a/Makefile.pre.in b/Makefile.pre.in index f94ba93cff91c..c1e58f7315f49 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1226,7 +1226,7 @@ Programs/python.o: $(srcdir)/Programs/python.c Programs/_testembed.o: $(srcdir)/Programs/_testembed.c Programs/test_frozenmain.h $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c -Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h $(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h +Modules/_sre/sre.o: $(srcdir)/Modules/_sre/sre.c $(srcdir)/Modules/_sre/sre.h $(srcdir)/Modules/_sre/sre_constants.h $(srcdir)/Modules/_sre/sre_lib.h Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h diff --git a/Modules/Setup.bootstrap.in b/Modules/Setup.bootstrap.in index ec724978f319b..e3e9b96b0630d 100644 --- a/Modules/Setup.bootstrap.in +++ b/Modules/Setup.bootstrap.in @@ -18,7 +18,7 @@ _collections _collectionsmodule.c errno errnomodule.c _io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c itertools itertoolsmodule.c -_sre _sre.c +_sre _sre/sre.c _thread _threadmodule.c time timemodule.c _weakref _weakref.c diff --git a/Modules/clinic/_sre.c.h b/Modules/_sre/clinic/sre.c.h similarity index 100% rename from Modules/clinic/_sre.c.h rename to Modules/_sre/clinic/sre.c.h diff --git a/Modules/_sre.c b/Modules/_sre/sre.c similarity index 99% rename from Modules/_sre.c rename to Modules/_sre/sre.c index 506363d6fbf6d..491734f243849 100644 --- a/Modules/_sre.c +++ b/Modules/_sre/sre.c @@ -2788,7 +2788,7 @@ pattern_richcompare(PyObject *lefto, PyObject *righto, int op) return PyBool_FromLong(cmp); } -#include "clinic/_sre.c.h" +#include "clinic/sre.c.h" static PyMethodDef pattern_methods[] = { _SRE_SRE_PATTERN_MATCH_METHODDEF diff --git a/Modules/sre.h b/Modules/_sre/sre.h similarity index 97% rename from Modules/sre.h rename to Modules/_sre/sre.h index e2c5277aefb5d..129f5595269f5 100644 --- a/Modules/sre.h +++ b/Modules/_sre/sre.h @@ -5,7 +5,7 @@ * * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. * - * See the _sre.c file for information on usage and redistribution. + * See the sre.c file for information on usage and redistribution. */ #ifndef SRE_INCLUDED diff --git a/Modules/sre_constants.h b/Modules/_sre/sre_constants.h similarity index 97% rename from Modules/sre_constants.h rename to Modules/_sre/sre_constants.h index 8b249493bd5cd..3e3643144a92c 100644 --- a/Modules/sre_constants.h +++ b/Modules/_sre/sre_constants.h @@ -8,7 +8,7 @@ * * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. * - * See the _sre.c file for information on usage and redistribution. + * See the sre.c file for information on usage and redistribution. */ #define SRE_MAGIC 20220402 diff --git a/Modules/sre_lib.h b/Modules/_sre/sre_lib.h similarity index 99% rename from Modules/sre_lib.h rename to Modules/_sre/sre_lib.h index 1cc926d956c63..34cd0552532f7 100644 --- a/Modules/sre_lib.h +++ b/Modules/_sre/sre_lib.h @@ -5,7 +5,7 @@ * * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. * - * See the _sre.c file for information on usage and redistribution. + * See the sre.c file for information on usage and redistribution. */ /* String matching engine */ diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 5e6e703df9123..9894e37cb78e1 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -296,9 +296,6 @@ <ClInclude Include="..\Modules\_math.h" /> <ClInclude Include="..\Modules\hashtable.h" /> <ClInclude Include="..\Modules\rotatingtree.h" /> - <ClInclude Include="..\Modules\sre.h" /> - <ClInclude Include="..\Modules\sre_constants.h" /> - <ClInclude Include="..\Modules\sre_lib.h" /> <ClInclude Include="..\Modules\_io\_iomodule.h" /> <ClInclude Include="..\Modules\cjkcodecs\alg_jisx0201.h" /> <ClInclude Include="..\Modules\cjkcodecs\cjkcodecs.h" /> @@ -359,7 +356,10 @@ <ClCompile Include="..\Modules\_pickle.c" /> <ClCompile Include="..\Modules\_randommodule.c" /> <ClCompile Include="..\Modules\_sha3\sha3module.c" /> - <ClCompile Include="..\Modules\_sre.c" /> + <ClCompile Include="..\Modules\_sre\sre.c" /> + <ClInclude Include="..\Modules\_sre\sre.h" /> + <ClInclude Include="..\Modules\_sre\sre_constants.h" /> + <ClInclude Include="..\Modules\_sre\sre_lib.h" /> <ClCompile Include="..\Modules\_stat.c" /> <ClCompile Include="..\Modules\_struct.c" /> <ClCompile Include="..\Modules\_weakref.c" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 86049a2a5df5d..55fca4982e0f3 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -240,15 +240,6 @@ <ClInclude Include="..\Modules\rotatingtree.h"> <Filter>Modules</Filter> </ClInclude> - <ClInclude Include="..\Modules\sre.h"> - <Filter>Modules</Filter> - </ClInclude> - <ClInclude Include="..\Modules\sre_constants.h"> - <Filter>Modules</Filter> - </ClInclude> - <ClInclude Include="..\Modules\sre_lib.h"> - <Filter>Modules</Filter> - </ClInclude> <ClInclude Include="..\Modules\_io\_iomodule.h"> <Filter>Modules\_io</Filter> </ClInclude> @@ -731,9 +722,18 @@ <ClCompile Include="..\Modules\_sha3\sha3module.c"> <Filter>Modules</Filter> </ClCompile> - <ClCompile Include="..\Modules\_sre.c"> + <ClCompile Include="..\Modules\_sre\sre.c"> <Filter>Modules</Filter> </ClCompile> + <ClInclude Include="..\Modules\_sre\sre.h"> + <Filter>Modules</Filter> + </ClInclude> + <ClInclude Include="..\Modules\_sre\sre_constants.h"> + <Filter>Modules</Filter> + </ClInclude> + <ClInclude Include="..\Modules\_sre\sre_lib.h"> + <Filter>Modules</Filter> + </ClInclude> <ClCompile Include="..\Modules\_statisticsmodule.c"> <Filter>Modules</Filter> </ClCompile> diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py index e58871cf73dce..19000096fc9c3 100644 --- a/Tools/c-analyzer/cpython/_parser.py +++ b/Tools/c-analyzer/cpython/_parser.py @@ -148,7 +148,7 @@ def clean_lines(text): Modules/_localemodule.c Py_BUILD_CORE 1 Modules/_operator.c Py_BUILD_CORE 1 Modules/_posixsubprocess.c Py_BUILD_CORE 1 -Modules/_sre.c Py_BUILD_CORE 1 +Modules/_sre/sre.c Py_BUILD_CORE 1 Modules/_threadmodule.c Py_BUILD_CORE 1 Modules/_tracemalloc.c Py_BUILD_CORE 1 Modules/_weakref.c Py_BUILD_CORE 1 @@ -262,8 +262,8 @@ def clean_lines(text): Modules/_dbmmodule.c HAVE_GDBM_DASH_NDBM_H 1 # others -Modules/sre_lib.h LOCAL(type) static inline type -Modules/sre_lib.h SRE(F) sre_ucs2_##F +Modules/_sre/sre_lib.h LOCAL(type) static inline type +Modules/_sre/sre_lib.h SRE(F) sre_ucs2_##F Objects/stringlib/codecs.h STRINGLIB_IS_UNICODE 1 Include/internal/pycore_bitutils.h _Py__has_builtin(B) 0 diff --git a/configure b/configure index bb1aa7568233d..a06d4c9b41d88 100755 --- a/configure +++ b/configure @@ -20557,6 +20557,7 @@ SRCDIRS="\ Modules/_multiprocessing \ Modules/_sha3 \ Modules/_sqlite \ + Modules/_sre \ Modules/_xxtestfuzz \ Modules/cjkcodecs \ Modules/expat \ diff --git a/configure.ac b/configure.ac index 9f0a50ec852b6..abcd379d705fb 100644 --- a/configure.ac +++ b/configure.ac @@ -5992,6 +5992,7 @@ SRCDIRS="\ Modules/_multiprocessing \ Modules/_sha3 \ Modules/_sqlite \ + Modules/_sre \ Modules/_xxtestfuzz \ Modules/cjkcodecs \ Modules/expat \

1 0

bpo-47194: Update zlib to v1.2.12 on Windows to resolve CVE-2018-25032 (GH-32241) (GH-32251)
by ned-deily April 3, 2022

April 3, 2022

https://github.com/python/cpython/commit/387f93c156288c170ff0016a75af06e109… commit: 387f93c156288c170ff0016a75af06e109d48ee1 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ned-deily <nad(a)python.org> date: 2022-04-03T23:27:22-04:00 summary: bpo-47194: Update zlib to v1.2.12 on Windows to resolve CVE-2018-25032 (GH-32241) (GH-32251) (cherry picked from commit 6066739ff7794e54c98c08b953a699cbc961cd28) Co-authored-by: Zachary Ware <zach(a)python.org> files: A Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst M PCbuild/get_externals.bat M PCbuild/python.props diff --git a/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst b/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst new file mode 100644 index 0000000000000..7e76add45fa95 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst @@ -0,0 +1 @@ +Update ``zlib`` to v1.2.12 to resolve CVE-2018-25032. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 677a6a41ab611..57628396ed06a 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,7 +55,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 set libraries=%libraries% xz-5.2.2 -set libraries=%libraries% zlib-1.2.11 +set libraries=%libraries% zlib-1.2.12 for %%e in (%libraries%) do ( if exist "%EXTERNALS_DIR%\%%e" ( diff --git a/PCbuild/python.props b/PCbuild/python.props index 296bfd637bf9e..1226d623831ba 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -53,7 +53,7 @@ <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> - <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> + <zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>  <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt>

1 0