Improve handling of frozen modules...

DRY tempfile creation in print.
Make a pass over "info line"

Author: rocky

trepan/bwprocessor/location.py

@@ -38,6 +38,7 @@ def format_location(proc_obj):
         location["lineno"] = lineno
 
         if "<string>" == filename and dbgr_obj.eval_string:
+            # DRY with create_tempfile_and_remap_filename in trepan.processor.print.
             filename = pyficache.unmap_file(filename)
             if "<string>" == filename:
                 fd = tempfile.NamedTemporaryFile(

trepan/lib/stack.py

@@ -36,7 +36,6 @@
 from trepan.lib.format import (
     Arrow,
     Filename,
-    Function,
     LineNumber,
     Return,
     format_function,

trepan/processor/cmdfns.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2013, 2015, 2017-2018, 2020-2021, 2023-2024 Rocky
+#   Copyright (C) 2013, 2015, 2017-2018, 2020-2021, 2023-2024, 2026 Rocky
 #   Bernstein <[email protected]>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -20,43 +20,10 @@
 on/off setting value.
 """
 import sys
-import tempfile
-
-from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE
-
-
-def source_tempfile_remap(prefix, text, tempdir=None):
-    fd = tempfile.NamedTemporaryFile(
-        suffix=".py", prefix=prefix, dir=tempdir, delete=False
-    )
-    with fd:
-        fd.write(bytes(text, "UTF-8"))
-        fd.close()
-        pass
-    return fd.name
 
 
 def deparse_fn(code):
-    try:
-        if PYTHON_VERSION_TRIPLE >= (3, 9):
-            # Don't have decompiler here yet.
-            return None
-        if (3, 7) <= PYTHON_VERSION_TRIPLE < (3, 9):
-            from decompyle3.semantics.linemap import (
-                code_deparse_with_fragments_and_map as deparse_code,
-            )
-        else:
-            from uncompyle6.semantics.linemap import (
-                code_deparse_with_fragments_and_map as deparse_code,
-            )
-
-    except ImportError:
-        return None
-    try:
-        deparsed = deparse_code(code, is_pypy=IS_PYPY)
-        return deparsed
-    except Exception:
-        raise
+    # Don't have decompiler here yet.
     return None
 
 

trepan/processor/command/info_subcmd/line.py

@@ -20,7 +20,7 @@
 import re
 
 import columnize
-from pyficache import get_linecache_info
+from pyficache import get_linecache_info, file2file_remap
 
 from trepan.clifns import search_file
 from trepan.lib.format import Filename, format_line_number, format_token
@@ -93,6 +93,7 @@ def lineinfo(self, arg):
     def run(self, args):
         """Current line number in source file"""
         # info line <loc>
+        remapped_filename = None
         if len(args) == 0:
             if not self.proc.curframe:
                 self.errmsg("Frame is needed when no line number is given.")
@@ -101,7 +102,6 @@ def run(self, args):
             # No line number. Use current frame line number
             line_number = inspect.getlineno(self.proc.curframe)
             filename = self.core.canonic_filename(self.proc.curframe)
-
         elif len(args) == 1:
             # lineinfo returns (item, file, lineno) or (None,)
             line_number, filename = self.lineinfo(args[2:])
@@ -112,24 +112,30 @@ def run(self, args):
         else:
             self.errmsg("Wrong number of arguments.")
             return
-        if not osp.isfile(filename):
-            filename = search_file(filename, self.core.search_path, self.main_dirname)
-            pass
 
-        # FIXME: this needs work.
-        linecache_info = get_linecache_info(filename)
-        if line_number not in linecache_info.line_numbers:
-            self.errmsg(
-                "No line information for line %d of %s" % (line_number, filename)
-            )
-            return
+        remapped_filename = file2file_remap.get(filename, filename)
 
         style = self.settings["style"]
         formatted_filename = format_token(
             Filename,
-            format_token(Filename, self.core.filename(filename), style=style),
+            format_token(Filename, remapped_filename, style=style),
             style=style,
         )
+
+        if remapped_filename != filename:
+            self.msg(f"{filename} remapped to {formatted_filename}")
+
+        if not osp.isfile(remapped_filename):
+            filename = search_file(remapped_filename, self.core.search_path, self.main_dirname)
+            pass
+
+        linecache_info = get_linecache_info(remapped_filename)
+        if line_number not in linecache_info.line_numbers:
+            self.errmsg(
+                "No line information for line %d of %s" % (line_number, formatted_filename)
+            )
+            return
+
         formatted_line_number = format_line_number(line_number, style)
         msg1 = "Line %s of %s" % (formatted_line_number, formatted_filename)
         line_info = linecache_info.line_info
@@ -152,7 +158,7 @@ def run(self, args):
         else:
             self.errmsg(
                 "No line information for line %d of %s"
-                % (line_number, self.core.filename(filename))
+                % (line_number, formatted_filename)
             )
         return False
 

trepan/processor/print.py

@@ -22,6 +22,7 @@
 from inspect import currentframe, ismodule
 from tempfile import NamedTemporaryFile
 from types import CodeType
+from typing import Optional
 
 import pyficache
 
@@ -104,8 +105,8 @@ def print_source_location_info(
     fn_name=None,
     f_lasti=None,
     remapped_file=None,
-    remapped_line_number: int=-1,
-    remapped_column_number: int=-1,
+    remapped_line_number: int = -1,
+    remapped_column_number: int = -1,
 ):
     """Print out a source location, e.g. the first line in
     line in:
@@ -154,7 +155,7 @@ def prefix_for_filename(deparsed_text: str) -> str:
         # check if it is blank and if so use other lines.
         for line in lines:
             if line:
-                cleaned_line = re.sub(r"[()'\"\s]", "_", line.strip())
+                cleaned_line = re.sub(r"[()<> '\"\s]", "_", line.strip())
                 return proc_obj._saferepr(cleaned_line)[1:-1][:10]
         return "..."
 
@@ -221,10 +222,12 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                     if not (
                         remapped_file := pyficache.main.code2tempfile.get(frame.f_code)
                     ):
-                        remapped_file = cmdfns.source_tempfile_remap(
-                            "eval_string",
+                        remapped_file = create_tempfile_and_remap_filename(
                             dbgr_obj.eval_string,
                             tempdir=proc_obj.settings("tempdir"),
+                            prefix="eval_string",
+                            suffix=".py",
+                            delete=False,
                         )
                         # pyficache.remap_file(filename, remapped_file)
                         pyficache.main.code2tempfile[frame.f_code] = filename
@@ -270,8 +273,8 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                 pass
         else:
             m = re.search("^<frozen (.*)>", filename)
-            if m and m.group(1) in pyficache.file2file_remap:
-                remapped_file = pyficache.file2file_remap[m.group(1)]
+            if m and (frozen_name := m.group(1)) in pyficache.file2file_remap:
+                remapped_file = pyficache.file2file_remap[frozen_name]
                 pass
             elif filename in pyficache.file2file_remap:
                 remapped_file = pyficache.file2file_remap[filename]
@@ -281,10 +284,12 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                 remapped_file = pyficache.remap_file_pat(
                     filename, pyficache.main.remap_re_hash
                 )
-            elif m and m.group(1) in sys.modules:
-                remapped_file = m.group(1)
-                pyficache.remap_file(filename, remapped_file)
-            pass
+            elif m and frozen_name in sys.modules:
+                # try with good ol linecache and consider fixing pyficache
+                remapped_file = sys.modules[frozen_name].__file__
+                pyficache.remap_file(remapped_file, filename)
+                filename = remapped_file
+        pass
 
         opts = {
             "reload_on_change": proc_obj.settings("reload"),
@@ -303,15 +308,18 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
             if orig_line_number == 0:
                 line_number = 0
             line, remapped_line_number = pyficache.get_pyasm_line(
-                filename, line_number, is_source_line=True, offset=frame.f_lasti,
+                filename,
+                line_number,
+                is_source_line=True,
+                offset=frame.f_lasti,
             )
             if remapped_line_number >= 0:
                 # FIXME: +1 is because getlines is 0 origin.
                 remapped_line_number += 1
             if line is not None and opts["style"] not in ("plain", "none"):
                 line = pyficache.highlight_string(
-                        line, lexer=pyficache.pyasm_lexer, style=opts["style"]
-                    )
+                    line, lexer=pyficache.pyasm_lexer, style=opts["style"]
+                )
                 if line.endswith("\n"):
                     line = line[:-1]
 
@@ -349,19 +357,17 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                     lines = linecache.getlines(filename)
                     temp_name = filename
                 if lines and not pyficache.is_python_assembly_file(filename):
-                    # FIXME: DRY code with version in cmdproc.py print_location
+                    ####
                     prefix = osp.basename(temp_name).split(".")[0] + "-"
-                    fd = NamedTemporaryFile(
-                        suffix=".py",
-                        prefix=prefix,
-                        delete=False,
-                        dir=proc_obj.settings("tempdir"),
+                    text = "\n".join(lines)
+                    create_tempfile_and_remap_filename(
+                        text,
+                        filename=filename,
+                        tempdir=proc_obj.settings("tempdir"),
+                        prefix=".py",
+                        delete=False
                     )
-                    with fd:
-                        fd.write("\n".join(lines).encode("utf-8"))
-                        remapped_file = fd.name
-                        pyficache.remap_file(remapped_file, filename)
-                    fd.close()
+                    #####
                     if source_text:
                         pyficache.main.code2tempfile[frame.f_code] = remapped_file
                         intf_obj.msg(
@@ -452,9 +458,59 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
     return True
 
 
+def create_tempfile_and_remap_filename(
+    text: str,
+    filename: str,
+    tempdir: str,
+    prefix: Optional[str] = None,
+    suffix: str = ".py",
+    delete=False,
+) -> str:
+    """
+    Using `lines` associated with `filename`, create a temporary filename
+    using `prefix` in directory `tempdir`.
+
+    `filename is typically the `co_filename` field inside a Python
+    code object which is bogus. For example it might be <string> or <frozen runpy>
+    or some valid filename that just does not exist in our environment.
+
+    Therefore we create file name in the filesystem an use pyfcache to
+    remap that 'filename` to newly create filename with the contents given .
+    """
+
+    # FIXME: DRY code with version in cmdproc.py print_location
+    fd = NamedTemporaryFile(
+    suffix=".py",
+        prefix=prefix,
+        delete=delete,
+        dir=tempdir,
+    )
+    with fd:
+        fd.write(bytes(text, "UTF-8"))
+        remapped_file = fd.name
+        pyficache.remap_file(remapped_file, filename)
+        fd.close()
+        pass
+    return fd.name
+
+
 # Demo it
 if __name__ == "__main__":
 
+    def inside_frozen():
+        from trepan.processor.cmdproc import CommandProcessor
+        from trepan.processor.command.mock import MockDebugger
+        from inspect import currentframe
+        from trepan.processor.print import print_location
+
+        d = MockDebugger()
+        cmdproc = CommandProcessor(d.core)
+        cmdproc.frame = currentframe().f_back
+        cmdproc.event = "call"
+        cmdproc.setup()
+
+        print_location(cmdproc)
+
     def five():
         from trepan.processor.cmdproc import CommandProcessor
         from trepan.processor.command.mock import MockDebugger
@@ -479,4 +535,8 @@ def five():
 """
         )
 
+    import runpy
+
+    runpy._run_code(inside_frozen.__code__, {}, None)
+
     exec("five()")