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