linting ...

go over with flake8, isort and black

Author: rocky

.pre-commit-config.yaml

@@ -4,6 +4,11 @@ repos:
     hooks:
     - id: debug-statements
     - id: end-of-file-fixer
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        stages: [commit]
 -   repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:

__pkginfo__.py

@@ -90,7 +90,7 @@
 license = "GPL3"
 mailing_list = "python-debugger@googlegroups.com"
 modname = "trepan3k"
-py_modules = None
+py_modules = []
 short_desc = "GDB-like Python Debugger in the Trepan family"
 
 import os.path as osp

setup.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 import sys
 
+from setuptools import find_packages, setup
+
 SYS_VERSION = sys.version_info[0:2]
 if not ((3, 1) <= SYS_VERSION <= (3, 10)):
     mess = "Python Versions 3.1 to 3.10 are supported only in this package."
@@ -13,6 +15,7 @@
 
 # Get the package information used in setup().
 from __pkginfo__ import (
+    __version__,
     author,
     author_email,
     classifiers,
@@ -23,15 +26,12 @@
     modname,
     py_modules,
     short_desc,
-    __version__,
     web,
     zip_safe,
 )
 
 __import__("pkg_resources")
 
-from setuptools import setup, find_packages
-
 packages = find_packages()
 
 setup(

trepan/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: iso-8859-1 -*-
-#   Copyright (C) 2008-2010, 2013-2018, 2020-2022 Rocky Bernstein
+#   Copyright (C) 2008-2010, 2013-2018, 2020-2023 Rocky Bernstein
 #   <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -17,8 +17,12 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The command-line interface to the debugger.
 """
-import os, pyficache, sys, tempfile
+import os
 import os.path as osp
+import sys
+import tempfile
+
+import pyficache
 
 package = "trepan"
 
@@ -27,10 +31,10 @@
 import trepan.clifns as Mclifns
 import trepan.debugger as Mdebugger
 import trepan.exception as Mexcept
-import trepan.options as Moptions
 import trepan.interfaces.server as Mserver
 import trepan.lib.file as Mfile
 import trepan.misc as Mmisc
+import trepan.options as Moptions
 
 # The name of the debugger we are currently going by.
 __title__ = package
@@ -107,11 +111,7 @@ def main(dbg=None, sys_argv=list(sys.argv)):
 
         if Mfile.is_compiled_py(mainpyfile):
             try:
-                from xdis import (
-                    load_module,
-                    PYTHON_VERSION_TRIPLE,
-                    IS_PYPY,
-                )
+                from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE, load_module
                 from xdis.version_info import version_tuple_to_str
 
                 (
@@ -256,7 +256,6 @@ def write_wrapper(*args, **kwargs):
     #     pass
 
     while True:
-
         # Run the debugged script over and over again until we get it
         # right.
 

trepan/bwprocessor/command/__init__.py

@@ -13,7 +13,8 @@
 # """ Copyright (C) 2008, 2009, 2013 Rocky Bernstein <rocky@gnu.org> """
 __import__("pkg_resources").declare_namespace(__name__)
 
-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

trepan/bwprocessor/command/quit.py

@@ -11,11 +11,13 @@
 #
 #  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, threading
+import os
+import threading
+
+from trepan import exception as Mexcept
 
 # Our local modules
 from trepan.bwprocessor.command import base_cmd as Mbase_cmd
-from trepan import exception as Mexcept
 
 
 class QuitCommand(Mbase_cmd.DebuggerCommand):

trepan/bwprocessor/location.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2015, 2023 Rocky Bernstein <rocky@gnu.org>
 """ Location routines"""
 
-import pyficache, linecache, tempfile
+import linecache
+import tempfile
+
+import pyficache
+
 from trepan.lib import stack as Mstack
 
 

trepan/bwprocessor/main.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2010, 2013-2016 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2010, 2013-2016, 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 +14,17 @@
 #
 #   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, linecache, sys, traceback
-import pyficache
+import inspect
+import linecache
+import sys
+import traceback
 from reprlib import Repr
 
-from trepan import vprocessor as Mprocessor
-from trepan import exception as Mexcept, misc as Mmisc
-from trepan.lib import bytecode as Mbytecode, display as Mdisplay
-from trepan.lib import thred as Mthread
+import pyficache
+
+from trepan import exception as Mexcept, misc as Mmisc, vprocessor as Mprocessor
 from trepan.bwprocessor import location as Mlocation, msg as Mmsg
+from trepan.lib import bytecode as Mbytecode, display as Mdisplay, thred as Mthread
 
 
 def get_stack(f, t, botframe, proc_obj=None):
@@ -224,7 +227,7 @@ def eval(self, arg):
         """Eval string arg in the current frame context."""
         try:
             return eval(arg, self.curframe.f_globals, self.curframe.f_locals)
-        except:
+        except Exception:
             t, v = sys.exc_info()[:2]
             if isinstance(t, str):
                 exc_type_name = t
@@ -249,7 +252,7 @@ def exec_line(self, line):
         try:
             code = compile(line + "\n", '"%s"' % line, "single")
             exec(code, global_vars, local_vars)
-        except:
+        except Exception:
             t, v = sys.exc_info()[:2]
             if isinstance(t, bytes):
                 exc_type_name = t
@@ -265,7 +268,7 @@ def ok_for_running(self, cmd_obj, name, cmd_hash):
         if the command has the right number of arguments and so on.
         """
         if hasattr(cmd_obj, "execution_set"):
-            if not (self.core.execution_status in cmd_obj.execution_set):
+            if self.core.execution_status not in cmd_obj.execution_set:
                 part1 = "Command '%s' is not available for execution " "status:" % name
                 Mmsg.errmsg(
                     self,
@@ -357,7 +360,7 @@ def process_command(self):
                 except (Mexcept.DebuggerQuit, Mexcept.DebuggerRestart, SystemExit):
                     # Let these exceptions propagate through
                     raise
-                except:
+                except Exception:
                     Mmsg.errmsg(self, "INTERNAL ERROR: " + traceback.format_exc())
                     pass
                 pass
@@ -433,7 +436,7 @@ def _populate_commands(self):
             import_name = "command." + mod_name
             try:
                 command_mod = getattr(__import__(import_name), mod_name)
-            except:
+            except Exception:
                 print("Error importing %s: %s" % (mod_name, sys.exc_info()[0]))
                 continue
 
@@ -447,7 +450,7 @@ def _populate_commands(self):
                 try:
                     instance = eval(eval_cmd)
                     cmd_instances.append(instance)
-                except:
+                except Exception:
                     print(
                         "Error loading %s from %s: %s"
                         % (classname, mod_name, sys.exc_info()[0])

trepan/bwprocessor/msg.py

@@ -2,6 +2,7 @@
 #   Copyright (C) 2015 Rocky Bernstein <rocky@gnu.org>
 """ Common I/O routines"""
 
+
 # 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,
 # because we want to allow the interface (intf) to change

trepan/client.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009, 2013-2017, 2021 Rocky Bernstein
+#
+#   Copyright (C) 2009, 2013-2017, 2021, 2023 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
@@ -17,13 +18,12 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #    02110-1301 USA.
 
-import sys, time
+import sys
+import time
+from optparse import OptionParser
 
 # Our local modules
-from trepan.interfaces import client as Mclient
-from trepan.interfaces import comcodes as Mcomcodes
-
-from optparse import OptionParser
+from trepan.interfaces import client as Mclient, comcodes as Mcomcodes
 from trepan.version import __version__