Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions Doc/c-api/frame.rst
Original file line number Diff line number Diff line change
Expand Up @@ -243,41 +243,3 @@ Unless using :pep:`523`, you will not need this.
Return the currently executing line number, or -1 if there is no line number.

.. versionadded:: 3.12


.. c:var:: const PyTypeObject *PyUnstable_ExecutableKinds

An array of executable kinds (executor types) for frames, used for internal
debugging and tracing.

Tools like debuggers and profilers can use this to identify the type of execution
context associated with a frame (such as to filter out internal frames).
The entries are indexed by the following constants:

.. list-table::
:header-rows: 1
:widths: auto

* - Constant
- Description
* - .. c:macro:: PyUnstable_EXECUTABLE_KIND_SKIP
- The frame is internal (For example: inlined) and should be skipped by tools.
* - .. c:macro:: PyUnstable_EXECUTABLE_KIND_PY_FUNCTION
- The frame corresponds to a standard Python function.
* - .. c:macro:: PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION
- The frame corresponds to a function defined in native code.
* - .. c:macro:: PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR
- The frame corresponds to a method on a class instance.

Note that reading the executable kind from a frame is currently only
possible with undocumented internal APIs.

.. versionadded:: 3.13


.. c:macro:: PyUnstable_EXECUTABLE_KINDS

The number of entries in :c:data:`PyUnstable_ExecutableKinds`.

.. versionadded:: 3.13

7 changes: 7 additions & 0 deletions Doc/tools/removed-ids.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ using/configure.html: cmdoption-with-system-libmpdec
library/symtable.html: symtable.Class.get_methods
library/sys.html: sys._enablelegacywindowsfsencoding
c-api/import.html: c.PyImport_LazyImportsMode.PyImport_LAZY_NONE
c-api/frame.html: c.PyUnstable_EXECUTABLE_KINDS
c-api/frame.html: c.PyUnstable_ExecutableKinds
c-api/frame.html: c.PyUnstable_ExecutableKinds.PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION
c-api/frame.html: c.PyUnstable_ExecutableKinds.PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR
c-api/frame.html: c.PyUnstable_ExecutableKinds.PyUnstable_EXECUTABLE_KIND_PY_FUNCTION
c-api/frame.html: c.PyUnstable_ExecutableKinds.PyUnstable_EXECUTABLE_KIND_SKIP


## Old names for grammar tokens
reference/expressions.html: grammar-token-python-grammar-comp_for
Expand Down
9 changes: 9 additions & 0 deletions Doc/whatsnew/3.16.rst
Original file line number Diff line number Diff line change
Expand Up @@ -872,3 +872,12 @@ Deprecated C APIs

Removed C APIs
--------------

* The :c:var:`!PyUnstable_ExecutableKinds` array, as well as the macros
:c:macro:`!PyUnstable_EXECUTABLE_KIND_SKIP`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_PY_FUNCTION`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR` and
:c:macro:`!PyUnstable_EXECUTABLE_KINDS`, were removed.

(Contributed by Peters Bierma and Viktorin in :gh:`152105`.)
8 changes: 0 additions & 8 deletions Include/cpython/pyframe.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,3 @@ PyAPI_FUNC(int) PyUnstable_InterpreterFrame_GetLasti(struct _PyInterpreterFrame
/* Returns the currently executing line number, or -1 if there is no line number.
* Does not raise an exception. */
PyAPI_FUNC(int) PyUnstable_InterpreterFrame_GetLine(struct _PyInterpreterFrame *frame);

#define PyUnstable_EXECUTABLE_KIND_SKIP 0
#define PyUnstable_EXECUTABLE_KIND_PY_FUNCTION 1
#define PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION 3
#define PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR 4
#define PyUnstable_EXECUTABLE_KINDS 5

PyAPI_DATA(const PyTypeObject *) const PyUnstable_ExecutableKinds[PyUnstable_EXECUTABLE_KINDS+1];
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Remove the :c:var:`!PyUnstable_ExecutableKinds` array, as well as the macros
:c:macro:`!PyUnstable_EXECUTABLE_KIND_SKIP`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_PY_FUNCTION`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION`,
:c:macro:`!PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR` and
:c:macro:`!PyUnstable_EXECUTABLE_KINDS`, from the C API.
8 changes: 0 additions & 8 deletions Python/frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,3 @@ PyUnstable_InterpreterFrame_GetLine(_PyInterpreterFrame *frame)
int addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT);
return PyCode_Addr2Line(_PyFrame_GetCode(frame), addr);
}

const PyTypeObject *const PyUnstable_ExecutableKinds[PyUnstable_EXECUTABLE_KINDS+1] = {
[PyUnstable_EXECUTABLE_KIND_SKIP] = &_PyNone_Type,
[PyUnstable_EXECUTABLE_KIND_PY_FUNCTION] = &PyCode_Type,
[PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION] = &PyMethod_Type,
[PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR] = &PyMethodDescr_Type,
[PyUnstable_EXECUTABLE_KINDS] = NULL,
};
Loading