Miscellaneous linting

Author: rocky

trepan/lib/breakpoint.py

@@ -10,6 +10,7 @@
 from collections import defaultdict
 from types import CodeType, ModuleType
 from typing import Optional
+from types import FrameType
 from xdis import load_module
 
 
@@ -25,13 +26,13 @@ class Breakpoint:
 
     def __init__(
         self,
-        number,
-        filename,
-        line,
+        number: int,
+        filename: str,
+        line: int,
         temporary=False,
         condition=None,
         code=None,
-        offset=None,
+        offset: Optional[int] =None,
     ):
         self.offset = offset
         self.condition = condition
@@ -370,7 +371,7 @@ def reset(self):
     pass  # BreakpointManager
 
 
-def checkfuncname(brkpt: Breakpoint, frame):
+def checkfuncname(brkpt: Breakpoint, frame: FrameType):
     """
     Check whether we should break at `frame` because the frame's
     code object matches `brkpt.code`.

trepan/lib/deparse.py

@@ -11,7 +11,9 @@
 from xdis import PYTHON_VERSION_TRIPLE
 
 if PYTHON_VERSION_TRIPLE >= (3, 9):
-    pass
+    def deparse_and_cache(_co, _errmsg_fn, _tempdir=None):
+        print("Derparsing is not available for Python >= 3.9")
+
 else:
     if (3, 7) <= PYTHON_VERSION_TRIPLE:
         try:
@@ -93,6 +95,7 @@ def deparse_offset(co, name: str, last_i: int, errmsg_fn: Callable) -> tuple:
 
 # Demo it
 if __name__ == "__main__":
+
     import inspect
 
     def msg(msg_str):
@@ -104,8 +107,9 @@ def errmsg(msg_str):
         return
 
     curframe = inspect.currentframe()
-    mapped_name, name_for_code = deparse_and_cache(curframe.f_code, errmsg)
-    print(pyficache.getline(mapped_name, 7))
+    if curframe is not None:
+        mapped_name, name_for_code = deparse_and_cache(curframe.f_code, errmsg)
+        print(pyficache.getline(mapped_name, 7))
     # mapped_name, name_for_code = deparse_offset(curframe.f_code,
     #                                             curframe.f_code.co_name,
     #                                             curframe.f_lasti, errmsg)

trepan/lib/format.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#   Copyright (C) 2013, 2015, 2017, 2019, 2020, 2023-2024
+#   Copyright (C) 2013, 2015, 2017, 2019, 2020, 2023-2025
 #   Rocky Bernstein <[email protected]>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -18,15 +18,18 @@
 """Pygments-related terminal formatting"""
 
 
-import pyficache
+import pyficache  # type: ignore
 import re
+import sys
 
 from pygments import format, highlight, lex
 from pygments.console import ansiformat
 from pygments.filter import Filter
 from pygments.formatter import Formatter
 from pygments.formatters import Terminal256Formatter, TerminalFormatter
-from pygments.formatters.terminal import TERMINAL_COLORS
+
+
+from pygments.formatters.terminal import TERMINAL_COLORS  # type: ignore
 from pygments.lexers import PythonLexer, RstLexer
 from pygments.token import (
     Comment,
@@ -409,6 +412,7 @@ def format_python(python_str: str, style) -> str:
     terminal_formatter = Terminal256Formatter(style=style)
     return highlight(python_str, python_lexer, terminal_formatter)
 
+
 def rst_text(text, mono, width=80):
     if mono:
         tf = mono_tf

trepan/lib/printing.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2007-2010, 2015, 2020, 2023-2024
+#  Copyright (C) 2007-2010, 2015, 2020, 2023-2025
 #  Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -17,22 +17,14 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import inspect
+import pprint
 import types
 from typing import Optional
 
 
 def print_dict(s, obj, title) -> str:
-    if hasattr(obj, "__dict__"):
-        obj = obj.__dict__
-        pass
-    if isinstance(obj, dict):
-        s += f"\n{title}:\n"
-        keys = list(obj.keys())
-        keys.sort()
-        for key in keys:
-            s += f"  {repr(key)}:\t{obj[key]}\n"
-            pass
-        pass
+    s += f"\n{title}:\n"
+    s += pprint.pformat(obj)
     return s
 
 

trepan/lib/stack.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #   Copyright (C) 2008-2010, 2013, 2015, 2017-2018, 2020-2021,
-#   2023-2024 Rocky Bernstein <[email protected]>
+#   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
@@ -25,6 +25,7 @@
 import re
 from opcode import opname
 from reprlib import repr
+from types import FrameType
 from typing import Optional, Tuple
 
 import xdis
@@ -55,20 +56,25 @@ def deparse_fn(code):
     have_deparser = True
 except ImportError:
 
-    def deparse_offset(code, name: str, list_i: int, _) -> tuple:
+    def deparse_offset(_code, _name: str, _list_i: int, _) -> tuple:
         return None, None
 
     have_deparser = False
 
 _with_local_varname = re.compile(r"_\[[0-9+]]")
 
 
-def count_frames(frame, count_start=0):
+def count_frames(frame: FrameType, count_start=0):
     """Return a count of the number of frames"""
     count = -count_start
-    while frame:
-        count += 1
-        frame = frame.f_back
+    for _ in range(1000):
+        if frame is None:
+            break
+        else:
+            count += 1
+            frame = frame.f_back
+    else:
+        return 1000
     return count
 
 
@@ -119,7 +125,7 @@ def deparse_source_from_code(code):
     return source_text
 
 
-def format_function_name(frame, style: str) -> Tuple[Optional[str], Optional[str]]:
+def format_function_name(frame: FrameType, style: str) -> Tuple[Optional[str], Optional[str]]:
     """
     Pick out the function name from ``frame`` and return both the name
     and the name styled according to ``style``
@@ -139,7 +145,7 @@ def format_function_name(frame, style: str) -> Tuple[Optional[str], Optional[str
     return funcname, format_token(Function, funcname, style=style)
 
 
-def format_function_and_parameters(frame, debugger, style: str) -> Tuple[bool, str]:
+def format_function_and_parameters(frame: FrameType, debugger, style: str) -> Tuple[bool, str]:
     """ """
 
     funcname, s = format_function_name(frame, style)
@@ -279,16 +285,18 @@ def frame2filesize(frame):
         bc_path = None
     path = frame.f_globals["__file__"]
     source_path = getsourcefile(path)
+    if source_path is None:
+        return None, None
     fs_size = os.stat(source_path).st_size
     if bc_path:
         (
-            version,
-            timestamp,
-            magic_int,
-            co,
-            is_pypy,
+            _version,
+            _timestamp,
+            _magic_int,
+            _co,
+            _is_pypy,
             bc_source_size,
-            sip_hash,
+            _sip_hash,
         ) = xdis.load_module(bc_path, fast_load=True, get_code=False)
         return fs_size, bc_source_size
     elif osp.exists(path):