Merge branch 'main' into none-constant-hash

Author: yonillasky

Doc/c-api/init.rst

@@ -1239,25 +1239,12 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
  The global interpreter lock need not be held, but may be held if it is
  necessary to serialize calls to this function.
 
- .. audit-event:: cpython.PyThreadState_New id c.PyThreadState_New
-
- Raise an auditing event ``cpython.PyThreadState_New`` with Python's thread
- id as the argument. The event will be raised from the thread creating the new
- ``PyThreadState``, which may not be the new thread.
-
 
 .. c:function:: void PyThreadState_Clear(PyThreadState *tstate)
 
  Reset all information in a thread state object. The global interpreter lock
  must be held.
 
- .. audit-event:: cpython.PyThreadState_Clear id c.PyThreadState_Clear
-
- Raise an auditing event ``cpython.PyThreadState_Clear`` with Python's
- thread id as the argument. The event may be raised from a different thread
- than the one being cleared. Exceptions raised from a hook will be treated
- as unraisable and will not abort the operation.
-
  .. versionchanged:: 3.9
  This function now calls the :c:member:`PyThreadState.on_delete` callback.
  Previously, that happened in :c:func:`PyThreadState_Delete`.

Lib/test/test_audit.py

@@ -197,19 +197,11 @@ def test_threading(self):
  actual = [(ev[0], ev[2]) for ev in events]
  expected = [
  ("_thread.start_new_thread", "(<test_func>, (), None)"),
- ("cpython.PyThreadState_New", "(2,)"),
  ("test.test_func", "()"),
- ("cpython.PyThreadState_Clear", "(2,)"),
  ]
 
  self.assertEqual(actual, expected)
 
- def test_threading_abort(self):
- # Ensures that aborting PyThreadState_New raises the correct exception
- returncode, events, stderr = self.run_python("test_threading_abort")
- if returncode:
- self.fail(stderr)
-
 
  def test_wmi_exec_query(self):
  import_helper.import_module("_wmi")

Lib/test/test_venv.py

@@ -594,7 +594,9 @@ def test_zippath_from_non_installed_posix(self):
  # For python built with shared enabled. We need to set
  # LD_LIBRARY_PATH so the non-installed python can find and link
  # libpython.so
- ld_library_path = os.path.abspath(os.path.dirname(sys.executable))
+ ld_library_path = sysconfig.get_config_var("LIBDIR")
+ if not ld_library_path or sysconfig.is_python_build():
+ ld_library_path = os.path.abspath(os.path.dirname(sys.executable))
  if sys.platform == 'darwin':
  ld_library_path_env = "DYLD_LIBRARY_PATH"
  else:

Objects/descrobject.c

@@ -17,7 +17,7 @@ class property "propertyobject *" "&PyProperty_Type"
 // see pycore_object.h
 #if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE)
 #include <emscripten.h>
-EM_JS(PyObject*, descr_set_trampoline_call, (setter set, PyObject *obj, PyObject *value, void *closure), {
+EM_JS(int, descr_set_trampoline_call, (setter set, PyObject *obj, PyObject *value, void *closure), {
  return wasmTable.get(set)(obj, value, closure);
 });
 

Objects/frameobject.c

@@ -849,15 +849,6 @@ static PyGetSetDef frame_getsetlist[] = {
  {0}
 };
 
-/* Stack frames are allocated and deallocated at a considerable rate.
- In an attempt to improve the speed of function calls, we maintain
- a separate free list of stack frames (just like floats are
- allocated in a special way -- see floatobject.c). When a stack
- frame is on the free list, only the following members have a meaning:
- ob_type == &Frametype
- f_back next item on free list, or NULL
-*/
-
 static void
 frame_dealloc(PyFrameObject *f)
 {

Python/pystate.c

@@ -875,27 +875,14 @@ PyThreadState_New(PyInterpreterState *interp)
  PyThreadState *tstate = new_threadstate(interp);
  if (tstate) {
  _PyThreadState_SetCurrent(tstate);
- if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
- PyThreadState_Clear(tstate);
- _PyThreadState_DeleteCurrent(tstate);
- return NULL;
- }
  }
  return tstate;
 }
 
 PyThreadState *
 _PyThreadState_Prealloc(PyInterpreterState *interp)
 {
- PyThreadState *tstate = new_threadstate(interp);
- if (tstate) {
- if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
- PyThreadState_Clear(tstate);
- _PyThreadState_Delete(tstate, 0);
- return NULL;
- }
- }
- return tstate;
+ return new_threadstate(interp);
 }
 
 // We keep this around for (accidental) stable ABI compatibility.
@@ -1043,10 +1030,6 @@ _PyInterpreterState_ClearModules(PyInterpreterState *interp)
 void
 PyThreadState_Clear(PyThreadState *tstate)
 {
- if (PySys_Audit("cpython.PyThreadState_Clear", "K", tstate->id) < 0) {
- PyErr_WriteUnraisable(NULL);
- }
-
  int verbose = _PyInterpreterState_GetConfig(tstate->interp)->verbose;
 
  if (verbose && tstate->cframe->current_frame != NULL) {