Address feedback from review

Author: pablogsal

Doc/library/inspect.rst

@@ -1163,7 +1163,7 @@ Classes and functions
 The interpreter stack
 ---------------------
 
-When the following functions return "frame records," each record is a
+When the following functions return ":class:`FrameInfo` objects," each record is a
 :class:`FrameInfo` object. For backwards compatibility these objects allow
 tuple-like operations on all attributes except ``positions``. This behavior
 is considered deprecated and may be removed in the future.
@@ -1199,8 +1199,9 @@ is considered deprecated and may be removed in the future.
 
    .. attribute:: positions
 
-      A tuple containing the start line number, end line number, start column offset and end column
-      offset associated with the instruction being executed by the frame this record corresponds to.
+      A :class:`dis.Positions` object containing the start line number, end line
+      number, start column offset and end column offset associated with the
+      instruction being executed by the frame this record corresponds to.
 
 .. versionchanged:: 3.5
    Return a named tuple instead of a tuple.
@@ -1280,10 +1281,10 @@ line.
 
 .. function:: getouterframes(frame, context=1)
 
-   Get a list of frame records for a frame and all outer frames.  These frames
-   represent the calls that lead to the creation of *frame*. The first entry in the
-   returned list represents *frame*; the last entry represents the outermost call
-   on *frame*'s stack.
+   Get a list of :class:`FrameInfo` objects for a frame and all outer frames.
+   These frames represent the calls that lead to the creation of *frame*. The
+   first entry in the returned list represents *frame*; the last entry
+   represents the outermost call on *frame*'s stack.
 
    .. versionchanged:: 3.5
       A list of :term:`named tuples <named tuple>`
@@ -1295,10 +1296,10 @@ line.
 
 .. function:: getinnerframes(traceback, context=1)
 
-   Get a list of frame records for a traceback's frame and all inner frames.  These
-   frames represent calls made as a consequence of *frame*.  The first entry in the
-   list represents *traceback*; the last entry represents where the exception was
-   raised.
+   Get a list of :class:`FrameInfo` objects for a traceback's frame and all
+   inner frames.  These frames represent calls made as a consequence of *frame*.
+   The first entry in the list represents *traceback*; the last entry represents
+   where the exception was raised.
 
    .. versionchanged:: 3.5
       A list of :term:`named tuples <named tuple>`
@@ -1322,9 +1323,9 @@ line.
 
 .. function:: stack(context=1)
 
-   Return a list of frame records for the caller's stack.  The first entry in the
-   returned list represents the caller; the last entry represents the outermost
-   call on the stack.
+   Return a list of :class:`FrameInfo` objects for the caller's stack.  The
+   first entry in the returned list represents the caller; the last entry
+   represents the outermost call on the stack.
 
    .. versionchanged:: 3.5
       A list of :term:`named tuples <named tuple>`
@@ -1336,10 +1337,10 @@ line.
 
 .. function:: trace(context=1)
 
-   Return a list of frame records for the stack between the current frame and the
-   frame in which an exception currently being handled was raised in.  The first
-   entry in the list represents the caller; the last entry represents where the
-   exception was raised.
+   Return a list of :class:`FrameInfo` objects for the stack between the current
+   frame and the frame in which an exception currently being handled was raised
+   in.  The first entry in the list represents the caller; the last entry
+   represents where the exception was raised.
 
    .. versionchanged:: 3.5
       A list of :term:`named tuples <named tuple>`

Lib/inspect.py

@@ -1702,7 +1702,8 @@ def getframeinfo(frame, context=1):
     else:
         lines = index = None
 
-    return Traceback(filename, lineno, frame.f_code.co_name, lines, index, tuple(positions))
+    return Traceback(filename, lineno, frame.f_code.co_name, lines,
+                     index, dis.Positions(*positions))
 
 def getlineno(frame):
     """Get the line number from a frame object, allowing for optimization."""

Lib/test/test_inspect.py

@@ -7,6 +7,7 @@
 import io
 import linecache
 import os
+import dis
 from os.path import normcase
 import _pickle
 import pickle
@@ -365,19 +366,19 @@ def test_stack(self):
         frameinfo = revise(*frame1[1:])
         self.assertEqual(frameinfo,
              (modfile, 16, 'eggs', ['    st = inspect.stack()\n'], 0))
-        self.assertEqual(frame1.positions, (16, 16, 9, 24))
+        self.assertEqual(frame1.positions, dis.Positions(16, 16, 9, 24))
         frameinfo = revise(*frame2[1:])
         self.assertEqual(frameinfo,
              (modfile, 9, 'spam', ['    eggs(b + d, c + f)\n'], 0))
-        self.assertEqual(frame2.positions, (9, 9, 4, 22))
+        self.assertEqual(frame2.positions, dis.Positions(9, 9, 4, 22))
         frameinfo = revise(*frame3[1:])
         self.assertEqual(frameinfo,
              (modfile, 43, 'argue', ['            spam(a, b, c)\n'], 0))
-        self.assertEqual(frame3.positions, (43, 43, 12, 25))
+        self.assertEqual(frame3.positions, dis.Positions(43, 43, 12, 25))
         frameinfo = revise(*frame4[1:])
         self.assertEqual(frameinfo,
              (modfile, 39, 'abuse', ['        self.argue(a, b, c)\n'], 0))
-        self.assertEqual(frame4.positions, (39, 39, 8, 27))
+        self.assertEqual(frame4.positions, dis.Positions(39, 39, 8, 27))
         # Test named tuple fields
         record = mod.st[0]
         self.assertIs(record.frame, mod.fr)
@@ -392,13 +393,13 @@ def test_trace(self):
         frame1, frame2, frame3, = git.tr
         self.assertEqual(revise(*frame1[1:]),
              (modfile, 43, 'argue', ['            spam(a, b, c)\n'], 0))
-        self.assertEqual(frame1.positions, (43, 43, 12, 25))
+        self.assertEqual(frame1.positions, dis.Positions(43, 43, 12, 25))
         self.assertEqual(revise(*frame2[1:]),
              (modfile, 9, 'spam', ['    eggs(b + d, c + f)\n'], 0))
-        self.assertEqual(frame2.positions, (9, 9, 4, 22))
+        self.assertEqual(frame2.positions, dis.Positions(9, 9, 4, 22))
         self.assertEqual(revise(*frame3[1:]),
              (modfile, 18, 'eggs', ['    q = y / 0\n'], 0))
-        self.assertEqual(frame3.positions, (18, 18, 8, 13))
+        self.assertEqual(frame3.positions, dis.Positions(18, 18, 8, 13))
 
     def test_frame(self):
         args, varargs, varkw, locals = inspect.getargvalues(mod.fr)