Merge branch 'main' into wasm_repl

hoodmane · hoodmane · commit 7d33525011ec · 2025-07-21T11:20:15.000+02:00
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
@@ -302,10 +302,10 @@ reading the following sections. If you're ready for that, grab some of your
 favourite beverage and carry on.
 
 If your logging needs are simple, then use the above examples to incorporate
-logging into your own scripts, and if you run into problems or don't
-understand something, please post a question on the comp.lang.python Usenet
-group (available at https://groups.google.com/g/comp.lang.python) and you
-should receive help before too long.
+logging into your own scripts, and if you run into problems or don't understand
+something, please post a question in the Help category of the `Python
+discussion forum <https://discuss.python.org/c/help/7>`_ and you should receive
+help before too long.
 
 Still here? You can carry on reading the next few sections, which provide a
 slightly more advanced/in-depth tutorial than the basic one above. After that,
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -2558,18 +2558,22 @@ PyObject *_Py_CreateMonitoringObject(void)
     err = PyObject_SetAttrString(events, "NO_EVENTS", _PyLong_GetZero());
     if (err) goto error;
     PyObject *val = PyLong_FromLong(PY_MONITORING_DEBUGGER_ID);
+    assert(val != NULL); /* Can't return NULL because the int is small. */
     err = PyObject_SetAttrString(mod, "DEBUGGER_ID", val);
     Py_DECREF(val);
     if (err) goto error;
     val = PyLong_FromLong(PY_MONITORING_COVERAGE_ID);
+    assert(val != NULL);
     err = PyObject_SetAttrString(mod, "COVERAGE_ID", val);
     Py_DECREF(val);
     if (err) goto error;
     val = PyLong_FromLong(PY_MONITORING_PROFILER_ID);
+    assert(val != NULL);
     err = PyObject_SetAttrString(mod, "PROFILER_ID", val);
     Py_DECREF(val);
     if (err) goto error;
     val = PyLong_FromLong(PY_MONITORING_OPTIMIZER_ID);
+    assert(val != NULL);
     err = PyObject_SetAttrString(mod, "OPTIMIZER_ID", val);
     Py_DECREF(val);
     if (err) goto error;
diff --git a/Tools/wasm/emscripten/__main__.py b/Tools/wasm/emscripten/__main__.py
@@ -216,7 +216,7 @@ def configure_emscripten_python(context, working_dir):
             text=True,
             capture_output=True,
         )
-        host_runner = res.stdout
+        host_runner = res.stdout.strip()
     pkg_config_path_dir = (PREFIX_DIR / "lib/pkgconfig/").resolve()
     env_additions = {
         "CONFIG_SITE": config_site,

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ def configure_emscripten_python(context, working_dir):`
`216`	`216`	`text=True,`
`217`	`217`	`capture_output=True,`
`218`	`218`	`)`
`219`		`- host_runner = res.stdout`
	`219`	`+ host_runner = res.stdout.strip()`
`220`	`220`	`pkg_config_path_dir = (PREFIX_DIR / "lib/pkgconfig/").resolve()`
`221`	`221`	`env_additions = {`
`222`	`222`	`"CONFIG_SITE": config_site,`