Misc pylint, isort and black stuff

rocky · rocky · commit 08de18087766 · 2023-05-26T09:51:19.000-04:00
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ clean:
 
 #: Create source (tarball) and binary (egg) distribution
 dist: check-rst
-	bash ./admin-tools/make-dist.sh
+	bash ./admin-tools/make-dist-newer.sh
 
 #: Create source tarball
 sdist: check-rst
diff --git a/trepan/bwcli.py b/trepan/bwcli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
-#   Copyright (C) 2013, 2015, 2020 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2013, 2015, 2020, 2023 Rocky Bernstein <rocky@gnu.org>
 #
 #   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
@@ -16,12 +16,12 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """ The hairy command-line interface to the debugger.
 """
-import os, os.path as osp, sys
+import os.path as osp
+import pyficache
+import sys
 
 from optparse import OptionParser
 
-from pyficache import resolve_name_to_path
-
 # Our local modules
 from trepan import clifns as Mclifns
 from trepan import debugger as Mdebugger, exception as Mexcept, misc as Mmisc
@@ -31,8 +31,8 @@
 # The name of the debugger we are currently going by.
 __title__ = "trepan"
 
-# VERSION.py sets variable VERSION.
-from trepan.VERSION import VERSION as __version__
+# version.py sets variable __version__
+from trepan.version import __version__
 
 
 def process_options(debugger_name, pkg_version, sys_argv, option_list=None):
diff --git a/trepan/lib/sighandler.py b/trepan/lib/sighandler.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009, 2013-2014, 2016, 2022 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2009, 2013-2014, 2016, 2022, 2023 Rocky Bernstein <rocky@gnu.org>
 #
 #   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
@@ -22,8 +22,10 @@
 #
 import signal
 
+from typing import Optional
 
-def yes_or_no(b):
+
+def yes_or_no(b) -> str:
     """Return 'Yes' for True and 'No' for False, and ?? for anything
     else."""
     if type(b) != bool:
@@ -33,7 +35,7 @@ def yes_or_no(b):
     return "No"
 
 
-def lookup_signame(num):
+def lookup_signame(num: int) -> Optional[str]:
     """Find the corresponding signal name for 'num'. Return None
     if 'num' is invalid."""
     signames = signal.__dict__
@@ -57,10 +59,10 @@ def lookup_signum(name):
         if hasattr(signal, uname):
             return getattr(signal, uname)
         return None
-    return  # Not reached
+    return  # noqa
 
 
-def canonic_signame(name_num):
+def canonic_signame(name_num) -> Optional[str]:
     """Return a signal name for a signal name or signal
     number.  Return None is name_num is an int but not a valid signal
     number and False if name_num is a not number. If name_num is a
@@ -211,7 +213,7 @@ def __init__(self, dbgr, ignore_list=None, default_print=True):
         self.action("SIGINT stop print nostack nopass")
         return
 
-    def initialize_handler(self, signame):
+    def initialize_handler(self, signame: str):
         if signame in fatal_signals:
             return False
         signum = lookup_signum(signame)
@@ -253,13 +255,13 @@ def initialize_handler(self, signame):
             pass
         return True
 
-    def set_signal_replacement(self, signum, handle):
+    def set_signal_replacement(self, signum: int, handle):
         """A replacement for signal.signal which chains the signal behind
         the debugger's handler"""
         signame = lookup_signame(signum)
         if signame is None:
             self.dbgr.intf[-1].errmsg(
-                ("%s is not a signal number" " I know about.") % signum
+                "%s is not a signal number I know about." % signum
             )
             return False
         # Since the intent is to set a handler, we should pass this
@@ -271,7 +273,7 @@ def set_signal_replacement(self, signum, handle):
                 return True
         return False
 
-    def check_and_adjust_sighandler(self, signame, sigs):
+    def check_and_adjust_sighandler(self, signame: str, sigs):
         """
         Check to see if a single signal handler that we are interested
         in has changed or has not been set initially. On return
diff --git a/trepan/processor/command/info_subcmd/__init__.py b/trepan/processor/command/info_subcmd/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2014, 2018 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2009, 2014, 2018, 2023 Rocky Bernstein
+#   <rocky@gnu.org>
 #
 #   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
@@ -13,9 +15,10 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""" Copyright (C) 2008, 2009, 2018 Rocky Bernstein <rocky@gnu.org> """
+""" Copyright (C) 2008, 2009, 2018, 2023 Rocky Bernstein <rocky@gnu.org> """
 
-import glob, os
+import glob
+import os
 
 # FIXME: Is it really helpful to "privatize" variable names below?
 # The below names are not part of the standard pre-defined names like
diff --git a/trepan/processor/command/info_subcmd/code.py b/trepan/processor/command/info_subcmd/code.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2015, 2023 Rocky Bernstein <rocky@gnu.org>
 #
 #   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
@@ -14,11 +14,12 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Our local modules
-from trepan.processor.command import base_subcmd as Mbase_subcmd
 from trepan.lib import complete as Mcomplete
 from trepan.processor import frame as Mframe
 
+# Our local modules
+from trepan.processor.command import base_subcmd as Mbase_subcmd
+
 
 class InfoCode(Mbase_subcmd.DebuggerSubcommand):
     """**info code** [ *frame-number* | *pyton code object* ]
@@ -79,10 +80,10 @@ def run(self, args):
                     return False
                 frame = proc.stack[frame_num][0]
                 code = frame.f_code
-            except:
+            except Exception:
                 try:
                     code = eval(args[0], frame.f_globals, frame.f_locals)
-                except:
+                except Exception:
                     self.errmsg(
                         "%s is not a evaluable as a code object or frame number."
                         % args[0]
@@ -127,7 +128,7 @@ def run(self, args):
 
 
 if __name__ == "__main__":
-    from trepan.processor.command import mock, info as Minfo
+    from trepan.processor.command import info as Minfo, mock
 
     d, cp = mock.dbg_setup()
     i = Minfo.InfoCommand(cp)
diff --git a/trepan/processor/command/info_subcmd/frame.py b/trepan/processor/command/info_subcmd/frame.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2015, 2023 Rocky Bernstein <rocky@gnu.org>
 #
 #   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
@@ -90,10 +90,10 @@ def run(self, args):
                     )
                     return False
                 frame = proc.stack[frame_num][0]
-            except:
+            except Exception:
                 try:
                     frame = eval(args[0], frame.f_globals, frame.f_locals)
-                except:
+                except Exception:
                     self.errmsg(
                         "%s is not a evaluable as a frame object or frame number."
                         % args[0]
@@ -107,7 +107,7 @@ def run(self, args):
 
         mess = (
             "Frame %d" % Mframe.frame_num(proc, frame_num)
-            if frame_num is not None
+            if frame_num is not None and proc.stack is not None
             else "Frame Info"
         )
         self.section(mess)
diff --git a/trepan/processor/command/info_subcmd/line.py b/trepan/processor/command/info_subcmd/line.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2013, 2015, 2020 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2009, 2013, 2015, 2020, 2023 Rocky Bernstein
+#   <rocky@gnu.org>
 #
 #   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
@@ -13,15 +15,18 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import inspect, re
+import inspect
 import os.path as osp
+import re
+
+from pyficache import code_line_info
 
-# Our local modules
-from trepan.processor.command.base_subcmd import DebuggerSubcommand
 from trepan.clifns import search_file
 from trepan.misc import wrapped_lines
 from trepan.processor.cmdbreak import parse_break_cmd
-from pyficache import code_line_info
+
+# Our local modules
+from trepan.processor.command.base_subcmd import DebuggerSubcommand
 
 
 def find_function(funcname, filename):
@@ -78,7 +83,7 @@ def lineinfo(self, arg):
         (func, filename, lineno, condition, offset) = parse_break_cmd(
             self.proc, ["info args"]
         )
-        if filename != None and lineno != None:
+        if filename is not None and lineno is not None:
             return lineno, filename
         else:
             return None, None
@@ -109,10 +114,7 @@ def run(self, args):
             pass
 
         line_info = code_line_info(filename, line_number)
-        msg1 = 'Line %d of "%s"' % (
-            line_number,
-            self.core.filename(filename),
-        )
+        msg1 = 'Line %d of "%s"' % (line_number, self.core.filename(filename),)
         if line_info:
             msg2 = "starts at offset %d of %s and contains %d instructions" % (
                 line_info[0].offsets[0],
@@ -142,9 +144,9 @@ def run(self, args):
 
 
 if __name__ == "__main__":
+    from trepan.debugger import Trepan
     from trepan.processor.command import mock
     from trepan.processor.command.info import InfoCommand
-    from trepan.debugger import Trepan
 
     d = Trepan()
     d, cp = mock.dbg_setup(d)
diff --git a/trepan/processor/command/info_subcmd/locals.py b/trepan/processor/command/info_subcmd/locals.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2013, 2015, 2018, 2020 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2009, 2013, 2015, 2018, 2020, 2023 Rocky
+#   Bernstein <rocky@gnu.org>
 #
 #   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
@@ -147,7 +149,6 @@ def run(self, args):
     d, cp = mock.dbg_setup(d)
     i = Minfo.InfoCommand(cp)
     sub = InfoLocals(i)
-    l = list(range(30))  # Add a simple array to the local mix printed below.
     import inspect
 
     cp.curframe = inspect.currentframe()
diff --git a/trepan/processor/command/info_subcmd/signals.py b/trepan/processor/command/info_subcmd/signals.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009, 2015 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2009, 2015, 2023 Rocky Bernstein <rocky@gnu.org>
 #
 #   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
@@ -17,13 +17,12 @@
 # Our local modules
 from trepan.processor.command import base_subcmd as Mbase_subcmd
 from trepan.lib import complete as Mcomplete
-import columnize
 
 
 class InfoSignals(Mbase_subcmd.DebuggerSubcommand):
-    """**info signals** [*signal-name*]
+    r"""**info signals** [*signal-name*]
 
-    **info signals** \*
+    **info signals** *
 
     Show information about how debugger treats signals to the program.
     Here are the boolean actions we can take:
diff --git a/trepan/processor/command/set_subcmd/__init__.py b/trepan/processor/command/set_subcmd/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2015, 2018, 2020 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2009, 2015, 2018, 2020, 2023 Rocky Bernstein
+#   <rocky@gnu.org>
 #
 #   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
@@ -13,7 +15,8 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""" Copyright (C) 2008-2009, 2015, 2018, 2020 Rocky Bernstein <rocky@gnu.org> """
+"""Copyright (C) 2008-2009, 2015, 2018, 2020, 2023
+   Rocky Bernstein <rocky@gnu.org>"""
 
 import glob
 import os.path as osp
