Some small lint

Author: rocky

docs/conf.py

@@ -56,7 +56,7 @@
 
 # General information about the project.
 project = "trepan3k"
-copyright = "2017, 2021 Rocky Bernstein"
+copyright = "2017, 2021, 2024 Rocky Bernstein"
 author = "Rocky Bernstein"
 
 # The version info for the project you're documenting, acts as replacement for

trepan/lib/core.py

@@ -29,7 +29,7 @@
 import os.path as osp
 import sys
 import threading
-from typing import Any
+from typing import Any, Dict, NewType, Optional
 
 # External packages
 import pyficache
@@ -44,18 +44,19 @@
 from trepan.processor.cmdproc import CommandProcessor
 from trepan.processor.trace import PrintProcessor
 
+InitOptions = NewType("InitOptions", Dict[str, Any])
+
+DEFAULT_INIT_OPTS: InitOptions = {
+    "processor": None,
+    # How many step events to skip before
+    # entering event processor? Zero (0) means stop at the next one.
+    # A negative number indicates no eventual stopping.
+    "step_ignore": 0,
+    "ignore_filter": None,  # But see debugger.py
+}
 
 class TrepanCore:
-    DEFAULT_INIT_OPTS = {
-        "processor": None,
-        # How many step events to skip before
-        # entering event processor? Zero (0) means stop at the next one.
-        # A negative number indicates no eventual stopping.
-        "step_ignore": 0,
-        "ignore_filter": None,  # But see debugger.py
-    }
-
-    def __init__(self, debugger, opts=None):
+    def __init__(self, debugger, opts: InitOptions=DEFAULT_INIT_OPTS):
         """Create a debugger object. But depending on the value of
         key 'start' inside hash `opts', we may or may not initially
         start tracing events (i.e. enter the debugger).
@@ -64,7 +65,7 @@ def __init__(self, debugger, opts=None):
         """
 
         def get_option(key: str) -> Any:
-            return option_set(opts, key, self.DEFAULT_INIT_OPTS)
+            return option_set(opts, key, DEFAULT_INIT_OPTS)
 
         self.bpmgr = BreakpointManager()
         self.current_bp = None
@@ -136,9 +137,10 @@ def get_option(key: str) -> Any:
 
         return
 
-    def add_ignore(self, *frames_or_fns):
+    def add_ignore(self, *frames_or_fns) -> Optional[Any]:
         """Add `frame_or_fn' to the list of functions that are not to
         be debugged"""
+        rc = None
         for frame_or_fn in frames_or_fns:
             rc = self.ignore_filter.add(frame_or_fn)
             pass
@@ -218,7 +220,7 @@ def remove_ignore(self, frame_or_fn):
         be debugged"""
         return self.ignore_filter.remove(frame_or_fn)
 
-    def start(self, opts=None):
+    def start(self, opts: InitOptions=DEFAULT_INIT_OPTS):
         """We've already created a debugger object, but here we start
         debugging in earnest. We can also turn off debugging (but have
         the hooks suspended or not) using 'stop'.
@@ -253,7 +255,7 @@ def get_option(key: str) -> Any:
             self.trace_hook_suspend = False
         return
 
-    def stop(self, options=None):
+    def stop(self, options=DEFAULT_INIT_OPTS):
         # Our version of:
         #    sys.settrace(None)
         try:
@@ -316,7 +318,6 @@ def is_break_here(self, frame):
                 return True
             else:
                 return False
-            pass
         return False
 
     def matches_condition(self, frame):
@@ -402,7 +403,7 @@ def set_next(self, frame, step_ignore=0, step_events=None):
         """Sets to stop on the next event that happens in frame `frame`.
         an raises an exception return to a frame below `frame`
         """
-        self.step_events = None  # Consider all events
+        self.step_events = step_events
         self.stop_level = count_frames(frame)
         self.last_level = self.stop_level
         self.last_frame = frame
@@ -422,7 +423,7 @@ def trace_dispatch(self, frame, event: str, arg):
 
         # Check to see if are in a call but we should be stepping over the call
         # using "next" of "finish". If so, then we can speed tracing by
-        # removing futher tracing. Not though that we *also* must make sure
+        # removing further tracing. Not though that we *also* must make sure
         # that we don't have any breakpoint set, since we have to check
         # for breakpoints in a kind of slow way of checking all events.
 
@@ -499,7 +500,6 @@ def trace_dispatch(self, frame, event: str, arg):
             except Exception:
                 pass
             pass
-        pass
 
     pass
 
@@ -510,7 +510,7 @@ def trace_dispatch(self, frame, event: str, arg):
     class MockProcessor:
         pass
 
-    opts = {"processor": MockProcessor()}
+    opts: InitOptions = {"processor": MockProcessor()}
     dc = TrepanCore(None, opts=opts)
     dc.step_ignore = 1
     print("dc._is_step_next_stop():", dc._is_step_next_stop("line"))

trepan/processor/location.py

@@ -219,7 +219,7 @@ def resolve_address_location(proc, location) -> Optional[Location]:
         try:
             mod_or_func_or_code = eval(location.method, g, locals_dict)
         except Exception:
-            split_names = location_method.split(".")
+            split_names = location.method.split(".")
             if len(split_names) > 1:
                 proc.msg(f'Try importing {".".join(split_names[:-1])}?')
             proc.errmsg(msg)