More lint

Author: rocky

__pkginfo__.py

@@ -82,7 +82,6 @@
 ftp_url = None
 install_requires = [
     "columnize >= 0.3.10",
-    "nose>=1.0.0, <= 1.3.7",
     "pyficache >= 2.3.0",
     "xdis >= 6.0.3,<6.2.0",
     "pygments %s" % pygments_version,

requirements.txt

@@ -3,7 +3,7 @@
 # The "pygments" version is not quite right
 # And the xdis version is missing
 columnize >= 0.3.10
-nose>=1.0.0, <= 1.3.7
+pyficache >= 2.3.0,
 pygments >= 2.2.0
 spark_parser
 tracer >= 0.3.2

test/unit/test_options.py

@@ -32,17 +32,17 @@ def test_options():
     }
     dbg_opts_set = {"proc_opts", "from_ipython"}
 
-    opts, dbg_opts, sys_argv = process_options("testing", "1.0", [__file__])
+    opts, dbg_opts, sys_argv = process_options("1.0", [__file__])
     diff_set = option_key_set - set(vars(opts).keys())
     assert diff_set == set(), "expecting at least these options keys set"
     assert (
         dbg_opts_set - set(dbg_opts.keys())
     ) == set(), "expecting at least these processor keys set"
 
     arg_str = f"{__file__} --fntrace --cd=/tmp"
-    opts, dbg_opts, sys_argv = process_options("testing", "1.1", arg_str.split())
+    opts, dbg_opts, sys_argv = process_options("1.1", arg_str.split())
     assert opts.cd == "/tmp"
 
     arg_str = f"{__file__} --style=emacs"
-    opts, dbg_opts, sys_argv = process_options("testing", "1.2", arg_str.split())
+    opts, dbg_opts, sys_argv = process_options("1.2", arg_str.split())
     assert opts.style == "emacs"

trepan/__main__.py

@@ -42,11 +42,10 @@
 
 def main(dbg=None, sys_argv=list(sys.argv)):
     """Routine which gets run if we were invoked directly"""
-    global __title__
 
     # Save the original just for use in the restart that works via exec.
     orig_sys_argv = list(sys_argv)
-    opts, dbg_opts, sys_argv = process_options(__title__, __version__, sys_argv)
+    opts, dbg_opts, sys_argv = process_options(__version__, sys_argv)
 
     if opts.server is not None:
         if opts.server == "tcp":

trepan/bwcli.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
-#   Copyright (C) 2013, 2015, 2020, 2023 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2013, 2015, 2020, 2023-2024
+#   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
@@ -23,14 +24,13 @@
 import pyficache
 
 # Our local modules
-from trepan import (
-    clifns as Mclifns,
-    debugger as Mdebugger,
-    exception as Mexcept,
-    misc as Mmisc,
-)
+import trepan.debugger
+
+from trepan.clifns import whence_file
+from trepan.exception import DebuggerQuit, DebuggerRestart
 from trepan.interfaces.bullwinkle import BWInterface
 from trepan.lib.file import readable
+from trepan.misc import wrapped_lines
 
 # The name of the debugger we are currently going by.
 __title__ = "trepan"
@@ -39,8 +39,8 @@
 from trepan.version import __version__
 
 
-def process_options(debugger_name, pkg_version, sys_argv, option_list=None):
-    """Handle debugger options. Set `option_list' if you are writing
+def process_options(pkg_version, sys_argv, option_list=None):
+    """Handle debugger options. Set ``option_list`` if you are writing
     another main program and want to extend the existing set of debugger
     options.
 
@@ -90,7 +90,7 @@ def process_options(debugger_name, pkg_version, sys_argv, option_list=None):
 
 
 def postprocess_options(dbg, opts):
-    """Handle options (`opts') that feed into the debugger (`dbg')"""
+    """Handle options (`opts') that feed into the debugger (``dbg``)"""
     # Set dbg.settings['printset']
     print_events = []
     if opts.fntrace:
@@ -109,28 +109,27 @@ def postprocess_options(dbg, opts):
 
     dbg.settings["highlight"] = "plain"
 
-    Mdebugger.debugger_obj = dbg
+    trepan.debugger_obj = dbg
     return
 
 
 def main(dbg=None, sys_argv=list(sys.argv)):
     """Routine which gets run if we were invoked directly"""
-    global __title__
 
     # Save the original just for use in the restart that works via exec.
     orig_sys_argv = list(sys_argv)
-    opts, dbg_opts, sys_argv = process_options(__title__, __version__, sys_argv)
+    opts, dbg_opts, sys_argv = process_options(__version__, sys_argv)
     dbg_opts["orig_sys_argv"] = sys_argv
     dbg_opts["interface"] = BWInterface()
     dbg_opts["processor"] = "bullwinkle"
 
     if dbg is None:
-        dbg = Mdebugger.Trepan(dbg_opts)
+        dbg = trepan.debugger.Trepan(dbg_opts)
         dbg.core.add_ignore(main)
         pass
     postprocess_options(dbg, opts)
 
-    # process_options has munged sys.argv to remove any options that
+    # process_options has munged sys.argv to remove any
     # options that belong to this debugger. The original options to
     # invoke the debugger and script are in global sys_argv
     if len(sys_argv) == 0:
@@ -140,7 +139,7 @@ def main(dbg=None, sys_argv=list(sys.argv)):
     else:
         mainpyfile = sys_argv[0]  # Get script filename.
         if not osp.isfile(mainpyfile):
-            mainpyfile = Mclifns.whence_file(mainpyfile)
+            mainpyfile = whence_file(mainpyfile)
             is_readable = readable(mainpyfile)
             if is_readable is None:
                 print(
@@ -207,16 +206,16 @@ def main(dbg=None, sys_argv=list(sys.argv)):
             dbg.core.execution_status = "Terminated"
             dbg.intf[-1].msg("The program finished - quit or restart")
             dbg.core.processor.process_commands()
-        except Mexcept.DebuggerQuit:
+        except DebuggerQuit:
             break
-        except Mexcept.DebuggerRestart:
+        except DebuggerRestart:
             dbg.core.execution_status = "Restart requested"
             if dbg.program_sys_argv:
                 sys.argv = list(dbg.program_sys_argv)
                 part1 = "Restarting %s with arguments:" % dbg.core.filename(mainpyfile)
                 args = " ".join(dbg.program_sys_argv[1:])
                 dbg.intf[-1].msg(
-                    Mmisc.wrapped_lines(part1, args, dbg.settings["width"])
+                    wrapped_lines(part1, args, dbg.settings["width"])
                 )
             else:
                 break

trepan/debugger.py

@@ -41,11 +41,13 @@
 # External Egg packages
 import tracer
 
+import trepan
 import trepan.interfaces.user as Muser
 
 # Default settings used here
 import trepan.lib.default as Mdefault
 import trepan.lib.sighandler as Msig
+
 from trepan.exception import DebuggerQuit, DebuggerRestart
 from trepan.misc import option_set
 
@@ -99,9 +101,6 @@ def run(self, cmd, start_opts=None, globals_=None, locals_=None):
                 exec(cmd, globals_, locals_)
             except DebuggerQuit:
                 pass
-            except DebuggerQuit:
-                pass
-            pass
         except DebuggerQuit:
             pass
         finally:
@@ -338,7 +337,7 @@ def __init__(self, opts=None):
             self.intf[-1].output = out
             pass
 
-        self.core = Mcore.TrepanCore(self, core_opts)
+        self.core = trepan.lib.core.TrepanCore(self, core_opts)
         self.core.add_ignore(self.core.stop)
 
         # When set True, we'll also suspend our debug-hook tracing.

trepan/lib/core.py

@@ -35,6 +35,7 @@
 import pyficache
 import tracer
 
+import trepan
 import trepan.clifns as Mclifns
 
 # Our local modules
@@ -61,8 +62,6 @@ def __init__(self, debugger, opts=None):
         See also `start' and `stop'.
         """
 
-        import trepan.bwprocessor as Mbwproc
-
         def get_option(key: str) -> Any:
             return option_set(opts, key, self.DEFAULT_INIT_OPTS)
 
@@ -94,7 +93,7 @@ def get_option(key: str) -> Any:
         if not self.processor:
             self.processor = Mcmdproc.CommandProcessor(self, opts=proc_opts)
         elif self.processor == "bullwinkle":
-            self.processor = Mbwproc.BWProcessor(self, opts=proc_opts)
+            self.processor = trepan.bwprocessor.BWProcessor(self, opts=proc_opts)
             pass
         # What events are considered in stepping. Note: 'None' means *all*.
         self.step_events = None