Pass down code objects and not frames

Author: pablogsal

Lib/linecache.py

@@ -104,9 +104,13 @@ def updatecache(filename, module_globals=None):
     # These imports are not at top level because linecache is in the critical
     # path of the interpreter startup and importing os and sys take a lot of time
     # and slows down the startup sequence.
-    import os
-    import sys
-    import tokenize
+    try:
+        import os
+        import sys
+        import tokenize
+    except ImportError:
+        # These import can fail if the interpreter is shutting down
+        return []
 
     if filename in cache:
         if len(cache[filename]) != 1:

Lib/test/test_repl.py

@@ -213,7 +213,7 @@ def bar(x):
         p.stdin.write(user_input)
         user_input2 = dedent("""
         import linecache
-        print(linecache.cache['<stdin>-1'])
+        print(linecache._interactive_cache[foo.__code__])
         """)
         p.stdin.write(user_input2)
         output = kill_python(p)

Lib/traceback.py

@@ -288,7 +288,7 @@ class FrameSummary:
     """
 
     __slots__ = ('filename', 'lineno', 'end_lineno', 'colno', 'end_colno',
-                 'name', '_lines', '_lines_dedented', 'locals', '_frame')
+                 'name', '_lines', '_lines_dedented', 'locals', '_code')
 
     def __init__(self, filename, lineno, name, *, lookup_line=True,
             locals=None, line=None,
@@ -308,7 +308,7 @@ def __init__(self, filename, lineno, name, *, lookup_line=True,
         self.colno = colno
         self.end_colno = end_colno
         self.name = name
-        self._frame = kwargs.get("_frame")
+        self._code = kwargs.get("_code")
         self._lines = line
         self._lines_dedented = None
         if lookup_line:
@@ -348,11 +348,9 @@ def _set_lines(self):
             lines = []
             for lineno in range(self.lineno, self.end_lineno + 1):
                 # treat errors (empty string) and empty lines (newline) as the same
-                line = None
-                if self._frame is not None and self.filename.startswith("<"):
-                    line = linecache._getline_from_code(self._frame.f_code, lineno, self._frame.f_globals).rstrip()
-                if line is None:
-                    line = linecache.getline(self.filename, lineno).rstrip()
+                line = linecache.getline(self.filename, lineno).rstrip()
+                if not line and self._code is not None and self.filename.startswith("<"):
+                    line = linecache._getline_from_code(self._code, lineno).rstrip()
                 lines.append(line)
             self._lines = "\n".join(lines) + "\n"
 
@@ -490,7 +488,7 @@ def _extract_from_extended_frame_gen(klass, frame_gen, *, limit=None,
                 FrameSummary(filename, lineno, name,
                     lookup_line=False, locals=f_locals,
                     end_lineno=end_lineno, colno=colno, end_colno=end_colno,
-                    _frame=f,
+                    _code=f.f_code,
                 )
             )
         for filename in fnames: