bpo-44964: Correct the note about the f_lasti field (GH-28208) (GH-28276)

(cherry picked from commit ab327f2929589407595a3de95727c8ab34ddd4af)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index dd3d509de23c07da91d5251f9a9ddab1b01e87a5..310167e86d0cb7997751675120c37686b32c9a8c 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1034,9 +1034,8 @@ Internal types
       :attr:`f_code` is the code object being executed in this frame; :attr:`f_locals`
       is the dictionary used to look up local variables; :attr:`f_globals` is used for
       global variables; :attr:`f_builtins` is used for built-in (intrinsic) names;
-      :attr:`f_lasti` gives the precise instruction (it represents a wordcode index, which
-      means that to get an index into the bytecode string of the code object it needs to be
-      multiplied by 2).
+      :attr:`f_lasti` gives the precise instruction (this is an index into the
+      bytecode string of the code object).
 
       Accessing ``f_code`` raises an :ref:`auditing event <auditing>`
       ``object.__getattr__`` with arguments ``obj`` and ``"f_code"``.

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index e76c761a6dbbb5b54f5bbd7207e64b22061a9719..c11fe41659c2096e2ec91c028711bba2e231c347 100644 (file)
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1959,7 +1959,8 @@ Changes in the C API
     offset instead of a simple offset into the bytecode string. This means that this
     number needs to be multiplied by 2 to be used with APIs that expect a byte offset
     instead (like :c:func:`PyCode_Addr2Line` for example). Notice as well that the
-    ``f_lasti`` member of ``FrameObject`` objects is not considered stable.
+    ``f_lasti`` member of ``FrameObject`` objects is not considered stable: please
+    use :c:func:`PyFrame_GetLineNumber` instead.
 
 CPython bytecode changes
 ========================