Cleaned up remaining import of Dict and List from Typing

Author: tleonhardt

cmd2/__init__.py

@@ -12,7 +12,6 @@
 # Check if user has defined a module that sets a custom value for argparse_custom.DEFAULT_ARGUMENT_PARSER.
 # Do this before loading cmd2.Cmd class so its commands use the custom parser.
 import argparse
-from typing import List
 
 from .ansi import (
     Bg,
@@ -56,7 +55,7 @@
 from .py_bridge import CommandResult
 from .utils import CompletionMode, CustomCompletionSettings, Settable, categorize
 
-__all__: List[str] = [
+__all__: list[str] = [
     'COMMAND_NAME',
     'DEFAULT_SHORTCUTS',
     # ANSI Exports

cmd2/ansi.py

@@ -986,10 +986,10 @@ def style(
     :raises TypeError: if bg isn't None or a subclass of BgColor
     :return: the stylized string
     """
-    # List of strings that add style
+    # list of strings that add style
     additions: list[AnsiSequence] = []
 
-    # List of strings that remove style
+    # list of strings that remove style
     removals: list[AnsiSequence] = []
 
     # Process the style settings

cmd2/exceptions.py

@@ -1,8 +1,6 @@
 """Custom exceptions for cmd2"""
 
-from typing import (
-    Any,
-)
+from typing import Any
 
 ############################################################################################################
 # The following exceptions are part of the public API

cmd2/plugin.py

@@ -3,9 +3,7 @@
 from dataclasses import (
     dataclass,
 )
-from typing import (
-    Optional,
-)
+from typing import Optional
 
 from .parsing import (
     Statement,

cmd2/rl_utils.py

@@ -6,9 +6,7 @@
 from enum import (
     Enum,
 )
-from typing import (
-    Union,
-)
+from typing import Union
 
 #########################################################################################################################
 # NOTE ON LIBEDIT:

examples/modular_commands/commandset_complex.py

@@ -3,9 +3,6 @@
 """
 
 import argparse
-from typing import (
-    List,
-)
 
 import cmd2
 
@@ -23,7 +20,7 @@ def do_banana(self, statement: cmd2.Statement):
     cranberry_parser.add_argument('arg1', choices=['lemonade', 'juice', 'sauce'])
 
     @cmd2.with_argparser(cranberry_parser, with_unknown_args=True)
-    def do_cranberry(self, ns: argparse.Namespace, unknown: List[str]):
+    def do_cranberry(self, ns: argparse.Namespace, unknown: list[str]):
         self._cmd.poutput('Cranberry {}!!'.format(ns.arg1))
         if unknown and len(unknown):
             self._cmd.poutput('Unknown: ' + ', '.join(['{}'] * len(unknown)).format(*unknown))
@@ -34,12 +31,12 @@ def help_cranberry(self):
 
     @cmd2.with_argument_list
     @cmd2.with_category('Also Alone')
-    def do_durian(self, args: List[str]):
+    def do_durian(self, args: list[str]):
         """Durian Command"""
         self._cmd.poutput('{} Arguments: '.format(len(args)))
         self._cmd.poutput(', '.join(['{}'] * len(args)).format(*args))
 
-    def complete_durian(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def complete_durian(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return self._cmd.basic_complete(text, line, begidx, endidx, ['stinks', 'smells', 'disgusting'])
 
     elderberry_parser = cmd2.Cmd2ArgumentParser()

examples/modular_commands_main.py

@@ -6,9 +6,7 @@
 
 import argparse
 from collections.abc import Iterable
-from typing import (
-    Optional,
-)
+from typing import Optional
 
 from modular_commands.commandset_basic import (  # noqa: F401
     BasicCompletionCommandSet,

examples/scripts/save_help_text.py

@@ -6,15 +6,12 @@
 import argparse
 import os
 import sys
-from typing import (
-    List,
-    TextIO,
-)
+from typing import TextIO
 
 ASTERISKS = "********************************************************"
 
 
-def get_sub_commands(parser: argparse.ArgumentParser) -> List[str]:
+def get_sub_commands(parser: argparse.ArgumentParser) -> list[str]:
     """Get a list of subcommands for an ArgumentParser"""
     sub_cmds = []
 

examples/table_creation.py

@@ -3,9 +3,7 @@
 
 import functools
 import sys
-from typing import (
-    Any,
-)
+from typing import Any
 
 from cmd2 import (
     EightBitBg,

plugins/template/cmd2_myplugin/myplugin.py

@@ -3,9 +3,7 @@
 
 import functools
 from collections.abc import Callable
-from typing import (
-    TYPE_CHECKING,
-)
+from typing import TYPE_CHECKING
 
 import cmd2
 

tests/test_argparse.py

@@ -3,9 +3,7 @@
 """
 
 import argparse
-from typing import (
-    Optional,
-)
+from typing import Optional
 
 import pytest
 

tests/test_argparse_completer.py

@@ -4,11 +4,7 @@
 
 import argparse
 import numbers
-from typing import (
-    Dict,
-    List,
-    cast,
-)
+from typing import cast
 
 import pytest
 
@@ -37,11 +33,11 @@
 standalone_completions = ['standalone', 'completer']
 
 
-def standalone_choice_provider(cli: cmd2.Cmd) -> List[str]:
+def standalone_choice_provider(cli: cmd2.Cmd) -> list[str]:
     return standalone_choices
 
 
-def standalone_completer(cli: cmd2.Cmd, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+def standalone_completer(cli: cmd2.Cmd, text: str, line: str, begidx: int, endidx: int) -> list[str]:
     return cli.basic_complete(text, line, begidx, endidx, standalone_completions)
 
 
@@ -113,7 +109,7 @@ def do_pos_and_flag(self, args: argparse.Namespace) -> None:
     TUPLE_METAVAR = ('arg1', 'others')
     CUSTOM_DESC_HEADER = "Custom Header"
 
-    # Lists used in our tests (there is a mix of sorted and unsorted on purpose)
+    # lists used in our tests (there is a mix of sorted and unsorted on purpose)
     non_negative_num_choices = [1, 2, 3, 0.5, 22]
     num_choices = [-1, 1, -2, 2.5, 0, -12]
     static_choices_list = ['static', 'choices', 'stop', 'here']
@@ -123,11 +119,11 @@ def do_pos_and_flag(self, args: argparse.Namespace) -> None:
     # This tests that CompletionItems created with numerical values are sorted as numbers.
     num_completion_items = [CompletionItem(5, "Five"), CompletionItem(1.5, "One.Five"), CompletionItem(2, "Five")]
 
-    def choices_provider(self) -> List[str]:
+    def choices_provider(self) -> list[str]:
         """Method that provides choices"""
         return self.choices_from_provider
 
-    def completion_item_method(self) -> List[CompletionItem]:
+    def completion_item_method(self) -> list[CompletionItem]:
         """Choices method that returns CompletionItems"""
         items = []
         for i in range(10):
@@ -189,13 +185,13 @@ def do_choices(self, args: argparse.Namespace) -> None:
     completions_for_pos_1 = ['completions', 'positional_1', 'probably', 'missed', 'spot']
     completions_for_pos_2 = ['completions', 'positional_2', 'probably', 'missed', 'me']
 
-    def flag_completer(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def flag_completer(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return self.basic_complete(text, line, begidx, endidx, self.completions_for_flag)
 
-    def pos_1_completer(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def pos_1_completer(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return self.basic_complete(text, line, begidx, endidx, self.completions_for_pos_1)
 
-    def pos_2_completer(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def pos_2_completer(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return self.basic_complete(text, line, begidx, endidx, self.completions_for_pos_2)
 
     completer_parser = Cmd2ArgumentParser()
@@ -263,11 +259,11 @@ def do_hint(self, args: argparse.Namespace) -> None:
     ############################################################################################################
     # Begin code related to CompletionError
     ############################################################################################################
-    def completer_raise_error(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def completer_raise_error(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         """Raises CompletionError"""
         raise CompletionError('completer broke something')
 
-    def choice_raise_error(self) -> List[str]:
+    def choice_raise_error(self) -> list[str]:
         """Raises CompletionError"""
         raise CompletionError('choice broke something')
 
@@ -282,13 +278,13 @@ def do_raise_completion_error(self, args: argparse.Namespace) -> None:
     ############################################################################################################
     # Begin code related to receiving arg_tokens
     ############################################################################################################
-    def choices_takes_arg_tokens(self, arg_tokens: Dict[str, List[str]]) -> List[str]:
+    def choices_takes_arg_tokens(self, arg_tokens: dict[str, list[str]]) -> list[str]:
         """Choices function that receives arg_tokens from ArgparseCompleter"""
         return [arg_tokens['parent_arg'][0], arg_tokens['subcommand'][0]]
 
     def completer_takes_arg_tokens(
-        self, text: str, line: str, begidx: int, endidx: int, arg_tokens: Dict[str, List[str]]
-    ) -> List[str]:
+        self, text: str, line: str, begidx: int, endidx: int, arg_tokens: dict[str, list[str]]
+    ) -> list[str]:
         """Completer function that receives arg_tokens from ArgparseCompleter"""
         match_against = [arg_tokens['parent_arg'][0], arg_tokens['subcommand'][0]]
         return self.basic_complete(text, line, begidx, endidx, match_against)
@@ -1204,7 +1200,7 @@ def test_complete_standalone(ac_app, flag, completions):
 
 # Custom ArgparseCompleter-based class
 class CustomCompleter(argparse_completer.ArgparseCompleter):
-    def _complete_flags(self, text: str, line: str, begidx: int, endidx: int, matched_flags: List[str]) -> List[str]:
+    def _complete_flags(self, text: str, line: str, begidx: int, endidx: int, matched_flags: list[str]) -> list[str]:
         """Override so flags with 'complete_when_ready' set to True will complete only when app is ready"""
 
         # Find flags which should not be completed and place them in matched_flags

tests/test_utils.py

@@ -334,10 +334,6 @@ def test_context_flag_exit_err(context_flag):
 
 
 def test_remove_overridden_styles():
-    from typing import (
-        List,
-    )
-
     from cmd2 import (
         Bg,
         EightBitBg,
@@ -348,7 +344,7 @@ def test_remove_overridden_styles():
         TextStyle,
     )
 
-    def make_strs(styles_list: List[ansi.AnsiSequence]) -> List[str]:
+    def make_strs(styles_list: list[ansi.AnsiSequence]) -> list[str]:
         return [str(s) for s in styles_list]
 
     # Test Reset All

tests_isolated/test_commandset/test_categories.py

@@ -2,9 +2,7 @@
 Simple example demonstrating basic CommandSet usage.
 """
 
-from typing import (
-    Any,
-)
+from typing import Any
 
 import cmd2
 from cmd2 import (

tests_isolated/test_commandset/test_commandset.py

@@ -4,9 +4,6 @@
 
 import argparse
 import signal
-from typing import (
-    List,
-)
 
 import pytest
 
@@ -59,7 +56,7 @@ def do_banana(self, statement: cmd2.Statement):
     cranberry_parser.add_argument('arg1', choices=['lemonade', 'juice', 'sauce'])
 
     @cmd2.with_argparser(cranberry_parser, with_unknown_args=True)
-    def do_cranberry(self, ns: argparse.Namespace, unknown: List[str]):
+    def do_cranberry(self, ns: argparse.Namespace, unknown: list[str]):
         self._cmd.poutput('Cranberry {}!!'.format(ns.arg1))
         if unknown and len(unknown):
             self._cmd.poutput('Unknown: ' + ', '.join(['{}'] * len(unknown)).format(*unknown))
@@ -70,13 +67,13 @@ def help_cranberry(self):
 
     @cmd2.with_argument_list
     @cmd2.with_category('Also Alone')
-    def do_durian(self, args: List[str]):
+    def do_durian(self, args: list[str]):
         """Durian Command"""
         self._cmd.poutput('{} Arguments: '.format(len(args)))
         self._cmd.poutput(', '.join(['{}'] * len(args)).format(*args))
         self._cmd.last_result = {'args': args}
 
-    def complete_durian(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def complete_durian(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return self._cmd.basic_complete(text, line, begidx, endidx, ['stinks', 'smells', 'disgusting'])
 
     elderberry_parser = cmd2.Cmd2ArgumentParser()
@@ -502,7 +499,7 @@ def __init__(self, dummy):
     def do_arugula(self, _: cmd2.Statement):
         self._cmd.poutput('Arugula')
 
-    def complete_style_arg(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def complete_style_arg(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return ['quartered', 'diced']
 
     bokchoy_parser = cmd2.Cmd2ArgumentParser()
@@ -740,7 +737,7 @@ def cut_banana(self, ns: argparse.Namespace):
         """Cut banana"""
         self.poutput('cutting banana: ' + ns.direction)
 
-    def complete_style_arg(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def complete_style_arg(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         return ['quartered', 'diced']
 
     bokchoy_parser = cmd2.Cmd2ArgumentParser()
@@ -795,7 +792,7 @@ def __init__(self, dummy):
         """dummy variable prevents this from being autoloaded in other tests"""
         super(SupportFuncProvider, self).__init__()
 
-    def complete_states(self, text: str, line: str, begidx: int, endidx: int) -> List[str]:
+    def complete_states(self, text: str, line: str, begidx: int, endidx: int) -> list[str]:
         assert self is complete_states_expected_self
         return self._cmd.basic_complete(text, line, begidx, endidx, self.states)