Simplify and ...

handle highlight="plain" in getlines()

trepan/lib/stack.py

@@ -17,6 +17,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """ Functions for working with Python frames"""
 
+import dis
 import inspect
 import linecache
 import os
@@ -263,8 +264,6 @@ def is_exec_stmt(frame):
     return hasattr(frame, "f_back") and get_call_function_name(frame) == "exec"
 
 
-import dis
-
 opc = get_opcode(PYTHON_VERSION_TRIPLE, IS_PYPY)
 
 
@@ -477,7 +476,6 @@ def __init__(self):
     # debug()
     # print_stack_entry(dd.core.processor, 0, "fruity")
 
-
     # print(format_stack_entry(m, (frame, 10,)))
     # print(format_stack_entry(m, (frame, 10,), color="dark"))
     # print("frame count: %d" % count_frames(frame))

trepan/processor/cmdproc.py

@@ -129,13 +129,12 @@ def fn_is_ignored(f):
     return stack, i
 
 
-def run_hooks(obj, hooks, *args):
-    """Run each function in `hooks' with args"""
-    for hook in hooks:
-        if hook(obj, *args):
-            return True
-        pass
-    return False
+def run_hooks(obj, hooks, *args) -> bool:
+    """Run each function in `hooks' with args
+    Returns True if a hook failed and so the caller should
+    leave its command loop.
+    """
+    return any((hook(obj, *args) for hook in hooks))
 
 
 def resolve_name(obj, command_name):
@@ -270,10 +269,9 @@ def print_location(proc_obj):
             "output": proc_obj.settings("highlight"),
         }
 
-        if (
-            "style" in proc_obj.debugger.settings
-            and proc_obj.debugger.settings.get("highlight", "plain") != "plain"
-        ):
+        if proc_obj.debugger.settings.get("highlight", "plain") == "plain":
+            opts["style"] = "plain"
+        elif "style" in proc_obj.debugger.settings:
             opts["style"] = proc_obj.settings("style")
 
         pyficache.update_cache(filename)
@@ -796,7 +794,8 @@ def process_commands(self):
                     break
                 pass
             pass
-        return run_hooks(self, self.postcmd_hooks)
+        run_hooks(self, self.postcmd_hooks)
+        return
 
     def process_command(self):
         # process command