Part of xdis API change...

Correct changes from last commit. Make it more explicit that opc is the
default opcode for this current Python interpreter

Author: rocky

trepan/lib/disassemble.py

@@ -116,7 +116,7 @@ def dis(
             if lasti == -1:
                 lasti = 0
             pass
-        opc = get_opcode(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
+        opc = PYTHON_OPCODES
         x = x.f_code
         if include_header:
             header_lines = Bytecode(x, opc).info().split("\n")
@@ -179,7 +179,7 @@ def dis(
     return None, None
 
 # Default opc whene none is given.
-DEFAULT_OPC = get_opcode(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
+PYTHON_OPCODES = get_opcode(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
 
 def disassemble(
     msg: Callable,
@@ -193,7 +193,7 @@ def disassemble(
     start_offset=0,
     end_offset=None,
     asm_format="extended",
-    opc=DEFAULT_OPC,
+    opc=PYTHON_OPCODES,
 ):
     """Disassemble a code object."""
     return disassemble_bytes(
@@ -232,7 +232,7 @@ def print_instruction(
     lasti: int=-1,
     line_starts = {},
     style="none",
-    opc=DEFAULT_OPC,
+    opc=PYTHON_OPCODES,
     asm_format="extended",
 ):
     """Disassemble bytecode at offset `offsets`."""
@@ -377,7 +377,7 @@ def disassemble_bytes(
     style="none",
     start_offset=0,
     end_offset=None,
-    opc=DEFAULT_OPC,
+    opc=PYTHON_OPCODES,
     asm_format="extended",
 ) -> tuple:
     """Disassemble byte string of code. If end_line is negative
@@ -472,7 +472,7 @@ def disassemble_instruction(
     freevars=(),
     line_starts={},
     style="none",
-    opc=DEFAULT_OPC,
+    opc=PYTHON_OPCODES,
     asm_format="extended",
 ) -> tuple:
     """Disassemble byte string of code. If end_line is negative

trepan/processor/command/info_subcmd/frame.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015, 2023-2024 Rocky Bernstein <[email protected]>
+#   Copyright (C) 2015, 2023-2025 Rocky Bernstein <[email protected]>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 from pyficache import getline, highlight_string
 
 from trepan.lib.complete import complete_token
-from trepan.lib.disassemble import opc
+from trepan.lib.disassemble import PYTHON_OPCODES as python_opcodes
 from trepan.lib.format import Function, Keyword, format_token
 from trepan.lib.stack import format_function_name
 from trepan.lib.thred import current_thread_name
@@ -152,7 +152,7 @@ def run(self, args):
 
         f_lasti = frame.f_lasti
         if f_lasti >= 0:
-            opname = opc.opname[code.co_code[f_lasti]]
+            opname = python_opcodes.opname[code.co_code[f_lasti]]
             opname_formatted = format_token(Keyword, opname, style=style)
             self.msg(f"  instruction offset and opname: {frame.f_lasti} {opname_formatted}")
         else:
@@ -164,7 +164,7 @@ def run(self, args):
         else:
             self.msg("  no previous frame")
         self.msg(f"  tracing function: {frame.f_trace}")
-        if hasattr(frame, "f_trace_opcodes"):
+        if hasattr(frame, "f_trace_python_opcodesodes"):
             self.msg_nocr(
                 f"  tracing opcodes: {highlight_string(str(frame.f_trace_opcodes), style=style)}"
             )