Bunch of random clenaups and fixes

Author: tleonhardt

cmd2/argparse_custom.py

@@ -977,7 +977,7 @@ def _ArgumentParser_check_value(self: argparse.ArgumentParser, action: argparse.
 ############################################################################################################
 
 
-def _SubParsersAction_remove_parser(self: argparse._SubParsersAction, name: str) -> None:  # type: ignore
+def _SubParsersAction_remove_parser(self: argparse._SubParsersAction, name: str) -> None:  # type: ignore[type-arg]
     """
     Removes a sub-parser from a sub-parsers group. Used to remove subcommands from a parser.
 
@@ -1289,7 +1289,7 @@ def __init__(
 
         self.set_ap_completer_type(ap_completer_type)  # type: ignore[attr-defined]
 
-    def add_subparsers(self, **kwargs: Any) -> argparse._SubParsersAction:  # type: ignore
+    def add_subparsers(self, **kwargs: Any) -> argparse._SubParsersAction:  # type: ignore[type-arg]
         """
         Custom override. Sets a default title if one was not given.
 

cmd2/cmd2.py

@@ -4599,7 +4599,7 @@ def do_ipy(self, _: argparse.Namespace) -> Optional[bool]:  # pragma: no cover
 
             # Allow users to install ipython from a cmd2 prompt when needed and still have ipy command work
             try:
-                start_ipython  # noqa F823
+                start_ipython  # noqa: F823
             except NameError:
                 from IPython import start_ipython  # type: ignore[import]
 
@@ -4636,7 +4636,7 @@ def do_ipy(self, _: argparse.Namespace) -> Optional[bool]:  # pragma: no cover
                 local_vars['self'] = self
 
             # Configure IPython
-            config = TraitletsLoader.Config()  # type: ignore
+            config = TraitletsLoader.Config()
             config.InteractiveShell.banner2 = (
                 'Entering an IPython shell. Type exit, quit, or Ctrl-D to exit.\n'
                 f'Run CLI commands with: {self.py_bridge_name}("command ...")\n'

cmd2/constants.py

@@ -1,4 +1,3 @@
-#
 """This module contains constants used throughout ``cmd2``."""
 
 # Unless documented in https://cmd2.readthedocs.io/en/latest/api/index.html

cmd2/parsing.py

@@ -1,4 +1,3 @@
-#
 """Statement parsing classes for cmd2"""
 
 import re

cmd2/plugin.py

@@ -1,4 +1,3 @@
-#
 """Classes for the cmd2 plugin system"""
 
 from dataclasses import (

cmd2/transcript.py

@@ -1,4 +1,3 @@
-#
 """Machinery for running and validating transcripts.
 
 If the user wants to run a transcript (see docs/transcript.rst),

examples/modular_commands/commandset_complex.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Test CommandSet
 """

examples/override_parser.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# coding=utf-8
-# flake8: noqa F402
 """
 The standard parser used by cmd2 built-in commands is Cmd2ArgumentParser.
 The following code shows how to override it with your own parser class.

examples/scripts/conditional.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa F821
 """
 This is a Python script intended to be used with the "python_scripting.py" cmd2 example application.
 

examples/scripts/save_help_text.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa F821
 """
 A cmd2 script that saves the help text for every command, subcommand, and topic to a file.
 This is meant to be run within a cmd2 session using run_pyscript.
@@ -29,9 +27,7 @@ def get_sub_commands(parser: argparse.ArgumentParser) -> List[str]:
                     sub_cmds.append(sub_cmd)
 
                     # Look for nested subcommands
-                    for nested_sub_cmd in get_sub_commands(sub_cmd_parser):
-                        sub_cmds.append('{} {}'.format(sub_cmd, nested_sub_cmd))
-
+                    sub_cmds.extend(f'{sub_cmd} {nested_sub_cmd}' for nested_sub_cmd in get_sub_commands(sub_cmd_parser))
                 break
 
     sub_cmds.sort()

plugins/tasks.py

@@ -1,6 +1,3 @@
-#
-# coding=utf-8
-# flake8: noqa E302
 """Development related tasks to be run with 'invoke'.
 
 Make sure you satisfy the following Python module requirements if you are trying to publish a release to PyPI:
@@ -147,7 +144,7 @@ def lint(context):
 
 # ruff formatter
 @invoke.task(pre=[ext_test_tasks.format])
-def format(context):
+def format(context):  # noqa: A001
     """Run formatter"""
     with context.cd(TASK_ROOT_STR):
         context.run("ruff format --check")

pyproject.toml

@@ -193,7 +193,7 @@ select = [
     "NPY",  # NumPy specific rules
     "PD",   # pandas-vet (Pandas specific rules)
     "PERF", # Perflint (warn about performance issues)
-    # "PGH", # pygrep-hooks (force specific rule codes when ignoring type or linter issues on a line)
+    # "PGH",  # pygrep-hooks (force specific rule codes when ignoring type or linter issues on a line)
     # "PIE", # flake8-pie (eliminate unnecessary use of pass, range starting at 0, etc.)
     "PLC", # Pylint Conventions
     "PLE", # Pylint Errors
@@ -270,16 +270,13 @@ per-file-ignores."examples/unicode_commands.py" = [
     "PLC2401", # non-ASCII characters in function names
 ]
 
-per-file-ignores."plugins/ext_test/*.py" = [
-    "INP001", # Module is part of an implicit namespace
-]
-
-per-file-ignores."plugins/template/*.py" = [
+per-file-ignores."plugins/*.py" = [
     "INP001", # Module is part of an implicit namespace
 ]
 
 per-file-ignores."tests/pyscript/*.py" = [
-    "F821", # Undefined name `app`
+    "F821",   # Undefined name `app`
+    "INP001", # Module is part of an implicit namespace
 ]
 
 per-file-ignores."tests/pyscript/raises_exception.py" = [

tasks.py

@@ -1,6 +1,3 @@
-#
-# coding=utf-8
-# flake8: noqa E302
 """Development related tasks to be run with 'invoke'.
 
 Make sure you satisfy the following Python module requirements if you are trying to publish a release to PyPI:
@@ -74,8 +71,8 @@ def pytest(context, junit=False, pty=True, base=False, isolated=False):
             context.run(tests_cmd, pty=pty)
         if isolated:
             for root, dirnames, _ in os.walk(str(TASK_ROOT / 'tests_isolated')):
-                for dir in dirnames:
-                    if dir.startswith('test_'):
+                for dir_name in dirnames:
+                    if dir_name.startswith('test_'):
                         context.run(command_str + ' tests_isolated/' + dir)
 
 
@@ -235,7 +232,7 @@ def lint(context):
 
 # ruff fast formatter
 @invoke.task()
-def format(context):
+def format(context):  # noqa: A001
     """Run ruff format --check"""
     with context.cd(TASK_ROOT_STR):
         context.run("ruff format --check")

tests/pyscript/echo.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 # Tests echo argument to app()
 app.cmd_echo = False
 

tests/pyscript/environment.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 # Tests that cmd2 populates __name__, __file__, and sets sys.path[0] to our directory
 import os
 import sys

tests/pyscript/help.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 app.cmd_echo = True
 app('help')
 

tests/pyscript/py_locals.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 # Tests how much a pyscript can affect cmd2.Cmd.py_locals
 
 del [locals()["test_var"]]

tests/pyscript/pyscript_dir.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 out = dir(app)
 out.sort()
 print(out)

tests/pyscript/recursive.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-# flake8: noqa F821
 """
 Example demonstrating that calling run_pyscript recursively inside another Python script isn't allowed
 """

tests/pyscript/self_in_py.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 # Tests self_in_py in pyscripts
 if 'self' in globals():
     print("I see self")

tests/pyscript/stdout_capture.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 # This script demonstrates when output of a command finalization hook is captured by a pyscript app() call
 import sys
 

tests/pyscript/stop.py

@@ -1,4 +1,3 @@
-# flake8: noqa F821
 app.cmd_echo = True
 app('help')
 

tests/test_ansi.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit testing for cmd2/ansi.py module
 """

tests/test_argparse.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Cmd2 testing for argument parsing
 """

tests/test_argparse_completer.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit/functional testing for argparse completer in cmd2
 """

tests/test_argparse_custom.py

@@ -1,4 +1,3 @@
-# flake8: noqa E302
 """
 Unit/functional testing for argparse customizations in cmd2
 """

tests/test_cmd2.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Cmd2 unit/functional testing
 """

tests/test_completion.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit/functional testing for readline tab completion functions in the cmd2.py module.
 

tests/test_history.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Test history functions of cmd2
 """

tests/test_parsing.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Test the parsing logic in parsing.py
 """

tests/test_plugin.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Test plugin infrastructure and hooks.
 """

tests/test_run_pyscript.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit/functional testing for run_pytest in cmd2
 """

tests/test_table_creator.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E501
 """
 Unit testing for cmd2/table_creator.py module
 """

tests/test_transcript.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Cmd2 functional testing based on transcript
 """

tests/test_utils.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit testing for cmd2/utils.py module.
 """

tests/test_utils_defining_class.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Unit testing for get_defining_class in cmd2/utils.py module.
 """

tests_isolated/test_commandset/test_argparse_subcommands.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 reproduces test_argparse.py except with SubCommands
 """

tests_isolated/test_commandset/test_commandset.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-# flake8: noqa E302
 """
 Test CommandSet
 """