Upgrade more modules

Author: rocky

appveyor.yml

@@ -64,7 +64,7 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "pip install --disable-pip-version-check --user --upgrade pip"
+  - "%CMD_IN_ENV% pip install --disable-pip-version-check --user --upgrade pip"
 
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,

trepan/processor/command/__init__.py

@@ -1,3 +1,4 @@
+#  Copyright (C) 2008-2009, 2013-2015, 2018, 2020 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
 #  the Free Software Foundation, either version 3 of the License, or
@@ -10,25 +11,27 @@
 #
 #  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, 2013-2015, 2018 Rocky Bernstein <rocky@gnu.org> """
 
 import glob, os
+import os.path as osp
 
 # FIXME: Is it really helpful to "privatize" variable names below?
 # The below names are not part of the standard pre-defined names like
 # __name__ or __file__ are.
 
 # Get the name of our directory.
-__command_dir__ = os.path.dirname(__file__)
+__command_dir__ = osp.dirname(__file__)
 
 # A glob pattern that will get all *.py files but not __init__.py
-__py_files__    = glob.glob(os.path.join(__command_dir__, '[a-z]*.py'))
+__py_files__ = glob.glob(osp.join(__command_dir__, "[a-z]*.py"))
 
 # Take the basename of the filename and drop off '.py'. That minus the
 # files in exclude_files and that becomes the list of modules that
 # commands.py will use to import
-exclude_files = ['mock.py']
-__modules__ = [ os.path.basename(filename[0:-3]) for
-                filename in __py_files__
-                if os.path.basename(filename) not in exclude_files]
-__all__ =  __modules__  + exclude_files
+exclude_files = ["mock.py"]
+__modules__ = [
+    osp.basename(filename[0:-3])
+    for filename in __py_files__
+    if osp.basename(filename) not in exclude_files
+]
+__all__ = __modules__ + exclude_files

trepan/processor/command/backtrace.py

@@ -123,9 +123,9 @@ def run(self, args):
 
 if __name__ == "__main__":
     from trepan.processor import cmdproc
-    from trepan import debugger
+    from trepan.debugger import Trepan
 
-    d = debugger.Debugger()
+    d = Trepan()
     cp = d.core.processor
     command = BacktraceCommand(cp)
     command.run(["backtrace", "wrong", "number", "of", "args"])

trepan/processor/command/base_subcmd.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009-2010, 2012-2013, 2015-2016 Rocky Bernstein
+#   Copyright (C) 2009-2010, 2012-2013, 2015-2016, 2020 Rocky Bernstein
 #
 #   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
@@ -32,17 +32,17 @@ class DebuggerSubcommand:
     """Base Class for Debugger subcommands. We pull in some helper
     functions for command from module cmdfns."""
 
-    in_list     = True  # Show item in help list of commands
+    in_list = True  # Show item in help list of commands
 
     # Run subcommand for those subcommands like "show"
     # which append current settings to list output.
-    run_cmd     = True
+    run_cmd = True
 
     run_in_help = True  # Run to get value in 'show' command?
-    min_abbrev  = 1
-    min_args    = 0
-    max_args    = None
-    need_stack  = False
+    min_abbrev = 1
+    min_args = 0
+    max_args = None
+    need_stack = False
 
     def __init__(self, cmd):
         """cmd contains the command object that this
@@ -55,15 +55,15 @@ def __init__(self, cmd):
         # errmsg(), msg(), and msg_nocr() might. (See the note below
         # on these latter 3 methods.)
         #
-        self.proc     = cmd.proc
-        self.core     = cmd.core
+        self.proc = cmd.proc
+        self.core = cmd.core
         self.debugger = cmd.debugger
         self.settings = cmd.debugger.settings
 
-        if not hasattr(self, 'short_help'):
+        if not hasattr(self, "short_help"):
             help = self.__doc__.split("\n")
             if len(help) > 0:
-                if help[0][0] == '*' and len(help) > 2:
+                if help[0][0] == "*" and len(help) > 2:
                     self.short_help = help[2]
                 else:
                     self.short_help = help[0]
@@ -75,20 +75,19 @@ def __init__(self, cmd):
         # that -- perhaps one may want to put several subcommands into
         # a single file. So in those cases, one will have to set self.name
         # accordingly by other means.
-        self.name  = self.__module__.split('.')[-1]
+        self.name = self.__module__.split(".")[-1]
 
         return
 
     def columnize_commands(self, commands):
         """List commands arranged in an aligned columns"""
         commands.sort()
-        width = self.debugger.settings['width']
-        return columnize.columnize(commands, displaywidth=width,
-                                   lineprefix='    ')
+        width = self.debugger.settings["width"]
+        return columnize.columnize(commands, displaywidth=width, lineprefix="    ")
 
     def confirm(self, msg, default=False):
         """ Convenience short-hand for self.debugger.intf.confirm """
-        return(self.debugger.intf[-1].confirm(msg, default))
+        return self.debugger.intf[-1].confirm(msg, default)
 
     # Note for errmsg, msg, and msg_nocr we don't want to simply make
     # an assignment of method names like self.msg = self.debugger.intf.msg,
@@ -98,22 +97,22 @@ def confirm(self, msg, default=False):
     # we wouldn't pick up that change in our self.msg
     def errmsg(self, msg):
         """ Convenience short-hand for self.debugger.intf[-1].errmsg """
-        return(self.debugger.intf[-1].errmsg(msg))
+        return self.debugger.intf[-1].errmsg(msg)
 
     def msg(self, msg):
         """ Convenience short-hand for self.debugger.intf[-1].msg """
-        return(self.debugger.intf[-1].msg(msg))
+        return self.debugger.intf[-1].msg(msg)
 
     def msg_nocr(self, msg):
         """ Convenience short-hand for self.debugger.intf[-1].msg_nocr """
-        return(self.debugger.intf[-1].msg_nocr(msg))
+        return self.debugger.intf[-1].msg_nocr(msg)
 
     aliases = ()
-    name    = 'YourCommandName'
+    name = "YourCommandName"
 
     def rst_msg(self, text):
         """Convenience short-hand for self.proc.rst_msg(text)"""
-        return(self.proc.rst_msg(text))
+        return self.proc.rst_msg(text)
 
     def run(self):
         """ The method that implements the debugger command.
@@ -122,54 +121,58 @@ def run(self):
         raise NotImplementedError(NotImplementedMessage)
 
     def section(self, message, opts={}):
-        if 'plain' != self.settings['highlight']:
-            message = colorize('bold', message)
+        if "plain" != self.settings["highlight"]:
+            message = colorize("bold", message)
         else:
-            message += "\n" + '-' * len(message)
+            message += "\n" + "-" * len(message)
             pass
         self.msg(message)
+
     pass
 
-from trepan.processor import cmdfns as Mcmdfns
-from trepan.lib import complete as Mcomplete
+
+from trepan.processor.cmdfns import run_set_bool, run_show_bool, run_show_int
+from trepan.lib.complete import complete_token
 
 
 class DebuggerSetBoolSubcommand(DebuggerSubcommand):
     max_args = 1
 
     def complete(self, prefix):
-        result = Mcomplete.complete_token(('on', 'off'), prefix)
+        result = complete_token(("on", "off"), prefix)
         return result
 
     def run(self, args):
         # Strip off ReStructuredText tags
-        doc = re.sub('[*]', '', self.short_help).lstrip()
+        doc = re.sub("[*]", "", self.short_help).lstrip()
         # Take only the first two tokens
-        i = doc.find(' ')
+        i = doc.find(" ")
         if i > 0:
-            j = doc.find(' ', i+1)
-            if j > 0: doc = doc[0:j]
+            j = doc.find(" ", i + 1)
+            if j > 0:
+                doc = doc[0:j]
             pass
-        doc = doc.capitalize().split('\n')[0].rstrip('.')
-        Mcmdfns.run_set_bool(self, args)
-        Mcmdfns.run_show_bool(self, doc)
+        doc = doc.capitalize().split("\n")[0].rstrip(".")
+        run_set_bool(self, args)
+        run_show_bool(self, doc)
         return
 
     def summary_help(self, subcmd_name, subcmd):
         return self.msg_nocr("%-12s: " % self.short_help)
+
     pass
 
 
 class DebuggerShowIntSubcommand(DebuggerSubcommand):
     max_args = 0
 
     def run(self, args):
-        if hasattr(self, 'short_help'):
+        if hasattr(self, "short_help"):
             short_help = self.short_help
         else:
             short_help = self.__doc__[5:].capitalize()
             pass
-        Mcmdfns.run_show_int(self, short_help)
+        run_show_int(self, short_help)
         return
 
 
@@ -178,12 +181,14 @@ class DebuggerShowBoolSubcommand(DebuggerSubcommand):
 
     def run(self, args):
         # Strip off ReStructuredText tags
-        doc = re.sub('[*]', '', self.short_help)
-        doc = doc[5:].capitalize().split('\n')[0].rstrip('.')
-        Mcmdfns.run_show_bool(self, doc)
+        doc = re.sub("[*]", "", self.short_help)
+        doc = doc[5:].capitalize().split("\n")[0].rstrip(".")
+        run_show_bool(self, doc)
         return
 
-if __name__ == '__main__':
-    from trepan.processor.command import mock
-    d, cp = mock.dbg_setup()
-    dd = DebuggerSubcommand(cp.commands['quit'])
+
+if __name__ == "__main__":
+    from trepan.processor.command.mock import dbg_setup
+
+    d, cp = dbg_setup()
+    dd = DebuggerSubcommand(cp.commands["quit"])

trepan/processor/command/break.py

@@ -16,7 +16,7 @@
 
 # Our local modules
 from trepan.processor.command.base_cmd import DebuggerCommand
-from trepan.processor import cmdbreak as Mcmdbreak
+from trepan.processor.cmdbreak import parse_break_cmd, set_break
 from trepan.processor.complete import complete_break_linenumber
 
 
@@ -73,9 +73,9 @@ class BreakCommand(DebuggerCommand):
     def run(self, args):
         force = True if args[0][-1] == "!" else False
 
-        (func, filename, lineno, condition) = Mcmdbreak.parse_break_cmd(self.proc, args)
+        (func, filename, lineno, condition) = parse_break_cmd(self.proc, args)
         if not (func == None and filename == None):
-            Mcmdbreak.set_break(
+            set_break(
                 self, func, filename, lineno, condition, False, args, force=force
             )
         return
@@ -85,12 +85,12 @@ def run(self, args):
 
     def doit(cmd, a):
         cmd.current_command = " ".join(a)
-        print(Mcmdbreak.parse_break_cmd(cmd.proc, a))
+        print(parse_break_cmd(cmd.proc, a))
 
     import sys
-    from trepan import debugger as Mdebugger
+    from trepan.debugger import Trepan
 
-    d = Mdebugger.Trepan()
+    d = Trepan()
     command = BreakCommand(d.core.processor)
     command.proc.frame = sys._getframe()
     command.proc.setup()

trepan/processor/command/delete.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#  Copyright (C) 2009, 2013, 2015, 2017 Rocky Bernstein
+#  Copyright (C) 2009, 2013, 2015, 2017, 2020 Rocky Bernstein
 #
 #  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,14 +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/>.
 
-import os
-
 # Our local modules
-from trepan.processor.command import base_cmd as Mbase_cmd
-from trepan.processor import complete as Mcomplete
+from trepan.processor.command.base_cmd import DebuggerCommand
+from trepan.processor.complete import complete_bpnumber
 
 
-class DeleteCommand(Mbase_cmd.DebuggerCommand):
+class DeleteCommand(DebuggerCommand):
     """**delete** [*bpnumber* [*bpnumber*...]]
 
 Delete some breakpoints.
@@ -34,20 +32,18 @@ class DeleteCommand(Mbase_cmd.DebuggerCommand):
 ---------
 `clear`
 """
-    category      = 'breakpoints'
-    aliases       = ('delete!',)
-    min_args      = 0
-    max_args      = None
-    name          = os.path.basename(__file__).split('.')[0]
-    need_stack    = False
-    short_help    = 'Delete some breakpoints or auto-display expressions'
 
-    complete = Mcomplete.complete_bpnumber
+    aliases = ("delete!",)
+    short_help = "Delete some breakpoints or auto-display expressions"
+
+    complete = complete_bpnumber
+
+    DebuggerCommand.setup(locals(), category="breakpoints")
 
     def run(self, args):
         if len(args) <= 1:
-            if '!' != args[0][-1]:
-                confirmed = self.confirm('Delete all breakpoints', False)
+            if "!" != args[0][-1]:
+                confirmed = self.confirm("Delete all breakpoints", False)
             else:
                 confirmed = True
 
@@ -56,22 +52,23 @@ def run(self, args):
             return
 
         for arg in args[1:]:
-            i = self.proc.get_int(arg, min_value=1, default=None,
-                                  cmdname='delete')
-            if i is None: continue
+            i = self.proc.get_int(arg, min_value=1, default=None, cmdname="delete")
+            if i is None:
+                continue
 
             success, msg = self.core.bpmgr.delete_breakpoint_by_number(i)
             if not success:
                 self.errmsg(msg)
             else:
-                self.msg('Deleted breakpoint %d' % i)
+                self.msg("Deleted breakpoint %d" % i)
                 pass
             pass
         return
 
 
-if __name__ == '__main__':
-    from trepan import debugger as Mdebugger
-    d = Mdebugger.Trepan()
+if __name__ == "__main__":
+    from trepan.debugger import Trepan
+
+    d = Trepan()
     command = DeleteCommand(d.core.processor)
     pass