Misc lint

Author: rocky

Makefile

@@ -30,7 +30,8 @@ flake8:
 	flake8 trepan
 
 #: Run all tests: unit, functional and integration verbosely
-check: test-unit test-functional test-integration # flake8
+# check: test-unit test-functional test-integration # flake8
+check: test-unit test-integration # flake8
 
 #: Run unit (white-box) tests
 test-unit:

trepan/__main__.py

@@ -111,8 +111,8 @@ def main(dbg=None, sys_argv=list(sys.argv)):
                     load_module,
                     PYTHON_VERSION_TRIPLE,
                     IS_PYPY,
-                    version_tuple_to_str,
                 )
+                from xdis.version_info import version_tuple_to_str
 
                 (
                     python_version,
@@ -197,7 +197,7 @@ def write_wrapper(*args, **kwargs):
                 # linemap_io = StringIO()
                 try:
                     decompile_file(mainpyfile, fd.file, mapstream=fd)
-                except:
+                except Exception:
                     print(
                         "%s: error decompiling '%s'" % (__title__, mainpyfile),
                         file=sys.stderr,

trepan/api.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2013-2017, 2019-2021 Rocky Bernstein <rocky@gnu.org>
+#
+#   Copyright (C) 2008-2009, 2013-2017, 2019-2021, 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
@@ -69,7 +71,7 @@ def run_eval(
         return dbg.run_eval(
             expression, start_opts=start_opts, globals_=globals_, locals_=locals_
         )
-    except:
+    except Exception:
         dbg.core.trace_hook_suspend = True
         if start_opts and "tb_fn" in start_opts:
             tb_fn = start_opts["tb_fn"]
@@ -92,7 +94,7 @@ def run_call(func, *args, **kwds):
     dbg = Trepan()
     try:
         return dbg.run_call(func, *args, **kwds)
-    except:
+    except Exception:
         uncaught_exception(dbg)
         pass
     return
@@ -119,7 +121,7 @@ def run_exec(statement, debug_opts=None, start_opts=None, globals_=None, locals_
         return dbg.run_exec(
             statement, start_opts=start_opts, globals_=globals_, locals_=locals_
         )
-    except:
+    except Exception:
         uncaught_exception(dbg)
         pass
     return

trepan/bwprocessor/command/mock.py

@@ -18,7 +18,7 @@
 """ Not a command. A stub class used by a command in its 'main' for
 demonstrating how the command works."""
 
-import os, sys
+import sys
 
 from trepan.lib import breakpoint, default
 

trepan/lib/format.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2013, 2015, 2017, 2019, 2020 Rocky Bernstein <rocky@gnu.org>
+
+#   Copyright (C) 2013, 2015, 2017, 2019, 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
@@ -47,13 +49,13 @@
 color_scheme[Generic.Emph] = color_scheme[Comment.Preproc]
 
 # Assume pygments has fixed up the horrible atom colors
-## FIXME: change some horrible colors under atom dark
-## this is a hack until I get general way to do colorstyle setting
-## color_scheme[Token.Comment]  = ('darkgray', 'white')
-## color_scheme[Token.Keyword]  = ('darkblue', 'green')
-## color_scheme[Token.Number]  = ('darkblue', 'blue')
-## color_scheme[Keyword]  = ('darkblue', 'turquoise')
-## color_scheme[Number]  = ('darkblue', 'green')
+# FIXME: change some horrible colors under atom dark
+# this is a hack until I get general way to do colorstyle setting
+# color_scheme[Token.Comment]  = ('darkgray', 'white')
+# color_scheme[Token.Keyword]  = ('darkblue', 'green')
+# color_scheme[Token.Number]  = ('darkblue', 'blue')
+# color_scheme[Keyword]  = ('darkblue', 'turquoise')
+# color_scheme[Number]  = ('darkblue', 'green')
 
 pyficache.dark_terminal_formatter.colorscheme = color_scheme
 pyficache.light_terminal_formatter.colorscheme = color_scheme

trepan/lib/printing.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-#  Copyright (C) 2007-2010, 2015, 2020 Rocky Bernstein
+#
+#  Copyright (C) 2007-2010, 2015, 2020, 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
@@ -36,7 +37,7 @@ def print_argspec(obj, obj_name):
     """A slightly decorated version of inspect.format_argspec"""
     try:
         return obj_name + inspect.formatargspec(*inspect.getargspec(obj))
-    except:
+    except Exception:
         return None
     return  # Not reached
 

trepan/processor/cmdlist.py

@@ -158,7 +158,7 @@ def parse_location(proc, args):
     def five():
         return 5
 
-    import os
+    import os  # noqa
 
     for cmd in (
         # "list",

trepan/processor/command/tbreak.py

@@ -15,9 +15,10 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
 
+from trepan.processor.cmdbreak import parse_break_cmd, set_break
+
 # Our local modules
 from trepan.processor.command.base_cmd import DebuggerCommand
-from trepan.processor.cmdbreak import parse_break_cmd, set_break
 from trepan.processor.complete import complete_break_linenumber
 
 
@@ -66,7 +67,7 @@ class TempBreakCommand(DebuggerCommand):
 
     def run(self, args):
         func, filename, lineno, condition, offset = parse_break_cmd(self.proc, args)
-        if not (func == None and filename == None):
+        if not (func is None and filename is None):
             set_break(self, func, filename, lineno, condition, True, args)
         return