Merge branch 'main' into fix/148740-uuid-cli-usage

Author: sumpygump

Doc/library/calendar.rst

@@ -54,13 +54,13 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
 
    .. method:: setfirstweekday(firstweekday)
 
-      Set the first weekday to *firstweekday*, passed as an :class:`int` (0--6)
+      Set the first weekday to *firstweekday*, passed as an :class:`int` (0--6).
 
       Identical to setting the :attr:`~Calendar.firstweekday` property.
 
    .. method:: iterweekdays()
 
-      Return an iterator for the week day numbers that will be used for one
+      Return an iterator for the weekday numbers that will be used for one
       week.  The first value from the iterator will be the same as the value of
       the :attr:`~Calendar.firstweekday` property.
 
@@ -86,7 +86,7 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       Return an iterator for the month *month* in the year *year* similar to
       :meth:`itermonthdates`, but not restricted by the :class:`datetime.date`
       range. Days returned will be tuples consisting of a day of the month
-      number and a week day number.
+      number and a weekday number.
 
 
    .. method:: itermonthdays3(year, month)
@@ -408,7 +408,7 @@ For simple text calendars this module provides the following functions.
 
 .. function:: monthrange(year, month)
 
-   Returns weekday of first day of the month and number of days in month,  for the
+   Returns weekday of first day of the month and number of days in month, for the
    specified *year* and *month*.
 
 
@@ -446,7 +446,7 @@ For simple text calendars this module provides the following functions.
    An unrelated but handy function that takes a time tuple such as returned by
    the :func:`~time.gmtime` function in the :mod:`time` module, and returns the
    corresponding Unix timestamp value, assuming an epoch of 1970, and the POSIX
-   encoding.  In fact, :func:`time.gmtime` and :func:`timegm` are each others'
+   encoding.  In fact, :func:`time.gmtime` and :func:`timegm` are each other's
    inverse.
 
 

Include/internal/pycore_stackref.h

@@ -71,8 +71,10 @@ static const _PyStackRef PyStackRef_NULL = { .index = 0 };
 static const _PyStackRef PyStackRef_ERROR = { .index = (1 << Py_TAGGED_SHIFT) };
 
 #define PyStackRef_None ((_PyStackRef){ .index = (2 << Py_TAGGED_SHIFT) } )
-#define PyStackRef_False ((_PyStackRef){ .index = (3 << Py_TAGGED_SHIFT) })
-#define PyStackRef_True ((_PyStackRef){ .index = (4 << Py_TAGGED_SHIFT) })
+#define _Py_STACKREF_FALSE_INDEX (3 << Py_TAGGED_SHIFT)
+#define _Py_STACKREF_TRUE_INDEX (4 << Py_TAGGED_SHIFT)
+#define PyStackRef_False ((_PyStackRef){ .index = _Py_STACKREF_FALSE_INDEX })
+#define PyStackRef_True ((_PyStackRef){ .index = _Py_STACKREF_TRUE_INDEX })
 
 #define INITIAL_STACKREF_INDEX (5 << Py_TAGGED_SHIFT)
 

Lib/test/support/strace_helper.py

@@ -74,7 +74,7 @@ def sections(self):
 def _filter_memory_call(call):
     # mmap can operate on a fd or "MAP_ANONYMOUS" which gives a block of memory.
     # Ignore "MAP_ANONYMOUS + the "MAP_ANON" alias.
-    if call.syscall == "mmap" and "MAP_ANON" in call.args[3]:
+    if call.syscall in ("mmap", "mmap2") and "MAP_ANON" in call.args[3]:
         return True
 
     if call.syscall in ("munmap", "mprotect"):

Misc/NEWS.d/next/Build/2026-04-17-21-45-32.gh-issue-148644.vwkknh.rst

@@ -0,0 +1 @@
+Errors during the PGO training job on Windows are no longer ignored, and a non-zero return code will cause the build to fail.

PCbuild/build.bat

@@ -170,16 +170,20 @@ if "%do_pgo%"=="true" (
     del /s "%dir%\*.pgc"
     del /s "%dir%\..\Lib\*.pyc"
     set conf=PGUpdate
-    if "%clean%"=="false" (
-        echo on
-        call "%dir%\..\python.bat" %pgo_job%
-        @echo off
-        call :Kill
-        set target=Build
-    )
+    if "%clean%"=="false" goto :RunPgoJob
 )
 goto :Build
 
+:RunPgoJob
+echo on
+call "%dir%\..\python.bat" %pgo_job%
+@echo off
+set pgo_errorlevel=%ERRORLEVEL%
+call :Kill
+if %pgo_errorlevel% NEQ 0 exit /B %pgo_errorlevel%
+set target=Build
+goto :Build
+
 :Kill
 echo on
 %MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^

Python/pylifecycle.c

@@ -1641,18 +1641,12 @@ Py_InitializeFromConfig(const PyConfig *config)
 void
 Py_InitializeEx(int install_sigs)
 {
-    PyStatus status;
-
-    status = _PyRuntime_Initialize();
-    if (_PyStatus_EXCEPTION(status)) {
-        Py_ExitStatusException(status);
-    }
-
     if (Py_IsInitialized()) {
         /* bpo-33932: Calling Py_Initialize() twice does nothing. */
         return;
     }
 
+    PyStatus status;
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);