Merge branch 'main' into patch-1

Author: jonathandung

Doc/tools/extensions/c_annotations.py

@@ -308,27 +308,27 @@ def _unstable_api_annotation() -> nodes.admonition:
 def _threadsafety_annotation(level: str) -> nodes.emphasis:
     match level:
         case "incompatible":
-            display = sphinx_gettext("Not safe to call from multiple threads.")
+            display = sphinx_gettext("Not safe to call from multiple threads")
             reftarget = "threadsafety-level-incompatible"
         case "compatible":
             display = sphinx_gettext(
                 "Safe to call from multiple threads"
-                " with external synchronization only."
+                " with external synchronization only"
             )
             reftarget = "threadsafety-level-compatible"
         case "distinct":
             display = sphinx_gettext(
                 "Safe to call without external synchronization"
-                " on distinct objects."
+                " on distinct objects"
             )
             reftarget = "threadsafety-level-distinct"
         case "shared":
             display = sphinx_gettext(
-                "Safe for concurrent use on the same object."
+                "Safe for concurrent use on the same object"
             )
             reftarget = "threadsafety-level-shared"
         case "atomic":
-            display = sphinx_gettext("Atomic.")
+            display = sphinx_gettext("Atomic")
             reftarget = "threadsafety-level-atomic"
         case _:
             raise AssertionError(f"Unknown thread safety level {level!r}")
@@ -340,9 +340,11 @@ def _threadsafety_annotation(level: str) -> nodes.emphasis:
         reftype="ref",
         refexplicit="True",
     )
-    prefix = sphinx_gettext("Thread safety:") + " "
+    prefix = " " + sphinx_gettext("Thread safety:") + " "
     classes = ["threadsafety", f"threadsafety-{level}"]
-    return nodes.emphasis("", prefix, ref_node, classes=classes)
+    return nodes.emphasis(
+        "", prefix, ref_node, nodes.Text("."), classes=classes
+    )
 
 
 def _return_value_annotation(result_refs: int | None) -> nodes.emphasis:

Misc/NEWS.d/next/Library/2026-03-18-16-58-17.gh-issue-146091.lBbo1L.rst

@@ -0,0 +1,3 @@
+Fix a bug in :func:`termios.tcsetwinsize` where passing a sequence that
+raises an exception in ``__getitem__`` would cause a :exc:`SystemError`
+instead of propagating the original exception.

Modules/termios.c

@@ -500,19 +500,24 @@ termios_tcsetwinsize_impl(PyObject *module, int fd, PyObject *winsz)
     PyObject *tmp_item;
     long winsz_0, winsz_1;
     tmp_item = PySequence_GetItem(winsz, 0);
+    if (tmp_item == NULL) {
+        return NULL;
+    }
     winsz_0 = PyLong_AsLong(tmp_item);
+    Py_DECREF(tmp_item);
     if (winsz_0 == -1 && PyErr_Occurred()) {
-        Py_XDECREF(tmp_item);
         return NULL;
     }
-    Py_XDECREF(tmp_item);
     tmp_item = PySequence_GetItem(winsz, 1);
+    if (tmp_item == NULL) {
+        return NULL;
+    }
     winsz_1 = PyLong_AsLong(tmp_item);
+    Py_DECREF(tmp_item);
     if (winsz_1 == -1 && PyErr_Occurred()) {
-        Py_XDECREF(tmp_item);
         return NULL;
     }
-    Py_XDECREF(tmp_item);
+
 
     termiosmodulestate *state = PyModule_GetState(module);
 

Platforms/emscripten/__main__.py

@@ -413,10 +413,41 @@ def make_mpdec(context, working_dir):
     write_library_config(prefix, "mpdec", mpdec_config, context.quiet)
 
 
+def calculate_node_path():
+    node_version = os.environ.get("PYTHON_NODE_VERSION", None)
+    if node_version is None:
+        node_version = load_config_toml()["node-version"]
+
+    subprocess.run(
+        [
+            "bash",
+            "-c",
+            f"source ~/.nvm/nvm.sh && nvm install {node_version}",
+        ],
+        check=True,
+    )
+
+    res = subprocess.run(
+        [
+            "bash",
+            "-c",
+            f"source ~/.nvm/nvm.sh && nvm which {node_version}",
+        ],
+        text=True,
+        capture_output=True,
+        check=True,
+    )
+    return res.stdout.strip()
+
+
 @subdir("host_dir", clean_ok=True)
 def configure_emscripten_python(context, working_dir):
     """Configure the emscripten/host build."""
     validate_emsdk_version(context.emsdk_cache)
+    host_runner = context.host_runner
+    if host_runner is None:
+        host_runner = calculate_node_path()
+
     paths = context.build_paths
     config_site = os.fsdecode(EMSCRIPTEN_DIR / "config.site-wasm32-emscripten")
 
@@ -435,19 +466,6 @@ def configure_emscripten_python(context, working_dir):
     )
     if pydebug:
         sysconfig_data += "-pydebug"
-
-    host_runner = context.host_runner
-    if node_version := os.environ.get("PYTHON_NODE_VERSION", None):
-        res = subprocess.run(
-            [
-                "bash",
-                "-c",
-                f"source ~/.nvm/nvm.sh && nvm which {node_version}",
-            ],
-            text=True,
-            capture_output=True,
-        )
-        host_runner = res.stdout.strip()
     pkg_config_path_dir = (paths["prefix_dir"] / "lib/pkgconfig/").resolve()
     env_additions = {
         "CONFIG_SITE": config_site,
@@ -613,8 +631,6 @@ def add_cross_build_dir_option(subcommand):
 
 
 def main():
-    default_host_runner = "node"
-
     parser = argparse.ArgumentParser()
     subcommands = parser.add_subparsers(dest="subcommand")
 
@@ -744,10 +760,10 @@ def main():
         subcommand.add_argument(
             "--host-runner",
             action="store",
-            default=default_host_runner,
+            default=None,
             dest="host_runner",
-            help="Command template for running the emscripten host"
-            f"`{default_host_runner}`)",
+            help="Command template for running the emscripten host "
+            "(default: use nvm to install the node version specified in config.toml)",
         )
 
     context = parser.parse_args()

Platforms/emscripten/config.toml

@@ -2,6 +2,7 @@
 # This allows for blanket copying of the Emscripten build code between supported
 # Python versions.
 emscripten-version = "4.0.12"
+node-version = "24"
 
 [libffi]
 url = "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz"