refactor: rewrite type annotations to use pep 585

Author: branchv

cleo/_utils.py

@@ -4,7 +4,6 @@
 
 from html.parser import HTMLParser
 from typing import Any
-from typing import List
 
 from pylev import levenshtein
 
@@ -49,7 +48,7 @@ def strip_tags(value: Any) -> str:
     return value
 
 
-def find_similar_names(name: str, names: List[str]) -> List[str]:
+def find_similar_names(name: str, names: list[str]) -> list[str]:
     """
     Finds names similar to a given command name.
     """

cleo/application.py

@@ -6,9 +6,6 @@
 
 from contextlib import suppress
 from typing import TYPE_CHECKING
-from typing import Dict
-from typing import List
-from typing import Optional
 from typing import cast
 
 from .commands.command import Command
@@ -62,27 +59,25 @@ class Application:
     def __init__(self, name: str = "console", version: str = "") -> None:
         self._name = name
         self._version = version
-        self._display_name: Optional[str] = None
+        self._display_name: str | None = None
         self._terminal = Terminal()
         self._default_command = "list"
         self._single_command = False
-        self._commands: Dict[str, Command] = {}
+        self._commands: dict[str, Command] = {}
         self._running_command = None
         self._want_helps = False
-        self._definition: Optional[Definition] = None
+        self._definition: Definition | None = None
         self._catch_exceptions = True
         self._auto_exit = True
         self._initialized = False
-        self._ui: Optional[UI] = None
+        self._ui: UI | None = None
 
         # TODO: signals support
-        self._event_dispatcher: Optional[EventDispatcher] = None
+        self._event_dispatcher: EventDispatcher | None = None
 
-        self._command_loader: Optional[CommandLoader] = None
+        self._command_loader: CommandLoader | None = None
 
-        self._solution_provider_repository: Optional[
-            "SolutionProviderRepository"
-        ] = None
+        self._solution_provider_repository: SolutionProviderRepository | None = None
 
     @property
     def name(self) -> str:
@@ -123,7 +118,7 @@ def definition(self) -> Definition:
         return self._definition
 
     @property
-    def default_commands(self) -> List[Command]:
+    def default_commands(self) -> list[Command]:
         return [HelpCommand(), ListCommand(), CompletionsCommand()]
 
     @property
@@ -138,7 +133,7 @@ def ui(self) -> UI:
         return self._ui
 
     @property
-    def event_dispatcher(self) -> Optional[EventDispatcher]:
+    def event_dispatcher(self) -> EventDispatcher | None:
         return self._event_dispatcher
 
     def set_event_dispatcher(self, event_dispatcher: EventDispatcher) -> None:
@@ -175,11 +170,11 @@ def is_single_command(self) -> bool:
         return self._single_command
 
     def set_solution_provider_repository(
-        self, solution_provider_repository: "SolutionProviderRepository"
+        self, solution_provider_repository: SolutionProviderRepository
     ) -> None:
         self._solution_provider_repository = solution_provider_repository
 
-    def add(self, command: Command) -> Optional[Command]:
+    def add(self, command: Command) -> Command | None:
         self._init()
 
         command.set_application(self)
@@ -238,7 +233,7 @@ def has(self, name: str) -> bool:
             self._command_loader.get(name)
         )
 
-    def get_namespaces(self) -> List[str]:
+    def get_namespaces(self) -> list[str]:
         namespaces = []
         seen = set()
 
@@ -287,7 +282,7 @@ def find(self, name: str) -> Command:
 
         raise CommandNotFoundException(name, all_commands)
 
-    def all(self, namespace: Optional[str] = None) -> Dict[str, Command]:
+    def all(self, namespace: str | None = None) -> dict[str, Command]:
         self._init()
 
         if namespace is None:
@@ -320,9 +315,9 @@ def all(self, namespace: Optional[str] = None) -> Dict[str, Command]:
 
     def run(
         self,
-        input: Optional[Input] = None,
-        output: Optional[Output] = None,
-        error_output: Optional[Output] = None,
+        input: Input | None = None,
+        output: Output | None = None,
+        error_output: Output | None = None,
     ) -> int:
         try:
             io = self.create_io(input, output, error_output)
@@ -470,9 +465,9 @@ def _run_command(self, command: Command, io: IO) -> int:
 
     def create_io(
         self,
-        input: Optional[Input] = None,
-        output: Optional[Output] = None,
-        error_output: Optional[Output] = None,
+        input: Input | None = None,
+        output: Output | None = None,
+        error_output: Output | None = None,
     ) -> IO:
         if input is None:
             input = ArgvInput()
@@ -599,7 +594,7 @@ def _get_command_name(self, io: IO) -> str:
 
         return io.input.first_argument
 
-    def extract_namespace(self, name: str, limit: Optional[int] = None) -> str:
+    def extract_namespace(self, name: str, limit: int | None = None) -> str:
         parts = name.split(" ")[:-1]
 
         if limit is not None:
@@ -612,7 +607,7 @@ def _get_default_ui(self) -> UI:
 
         return UI([ProgressBar()])
 
-    def _extract_all_namespaces(self, name: str) -> List[str]:
+    def _extract_all_namespaces(self, name: str) -> list[str]:
         parts = name.split(" ")[:-1]
         namespaces = []
 

cleo/color.py

@@ -2,9 +2,6 @@
 
 import os
 
-from typing import List
-from typing import Optional
-
 from .exceptions import ValueException
 
 
@@ -44,7 +41,7 @@ def __init__(
         self,
         foreground: str = "",
         background: str = "",
-        options: Optional[List[str]] = None,
+        options: list[str] | None = None,
     ) -> None:
         self._foreground = self._parse_color(foreground, False)
         self._background = self._parse_color(background, True)

cleo/commands/base_command.py

@@ -3,9 +3,6 @@
 import inspect
 
 from typing import TYPE_CHECKING
-from typing import Dict
-from typing import List
-from typing import Optional
 
 from cleo.exceptions import CleoException
 from cleo.io.inputs.definition import Definition
@@ -18,7 +15,7 @@
 
 class BaseCommand:
 
-    name: Optional[str] = None
+    name: str | None = None
 
     description = ""
 
@@ -27,14 +24,14 @@ class BaseCommand:
     enabled = True
     hidden = False
 
-    usages: List[str] = []
+    usages: list[str] = []
 
     def __init__(self) -> None:
         self._definition = Definition()
         self._full_definition = None
         self._application = None
         self._ignore_validation_errors = False
-        self._synopsis: Dict[str, str] = {}
+        self._synopsis: dict[str, str] = {}
 
         self.configure()
 
@@ -43,7 +40,7 @@ def __init__(self) -> None:
                 self.usages[i] = f"{self.name} {usage}"
 
     @property
-    def application(self) -> "Application":
+    def application(self) -> Application:
         return self._application
 
     @property
@@ -77,7 +74,7 @@ def processed_help(self) -> str:
     def ignore_validation_errors(self) -> None:
         self._ignore_validation_errors = True
 
-    def set_application(self, application: Optional["Application"] = None) -> None:
+    def set_application(self, application: Application | None = None) -> None:
         self._application = application
 
         self._full_definition = None

cleo/commands/command.py

@@ -5,9 +5,6 @@
 
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import List
-from typing import Optional
-from typing import Union
 
 from cleo.formatters.style import Style
 from cleo.io.inputs.string_input import StringInput
@@ -38,7 +35,7 @@ class Command(BaseCommand):
     commands = []
 
     def __init__(self) -> None:
-        self._io: Optional[IO] = None
+        self._io: IO | None = None
         super().__init__()
 
     @property
@@ -94,7 +91,7 @@ def handle(self) -> int:
         """
         raise NotImplementedError()
 
-    def call(self, name: str, args: Optional[str] = None) -> int:
+    def call(self, name: str, args: str | None = None) -> int:
         """
         Call another command.
         """
@@ -106,7 +103,7 @@ def call(self, name: str, args: Optional[str] = None) -> int:
 
         return self.application._run_command(command, self._io.with_input(input))
 
-    def call_silent(self, name: str, args: Optional[str] = None) -> int:
+    def call_silent(self, name: str, args: str | None = None) -> int:
         """
         Call another command silently.
         """
@@ -144,9 +141,7 @@ def confirm(
 
         return question.ask(self._io)
 
-    def ask(
-        self, question: Union[str, "Question"], default: Optional[Any] = None
-    ) -> Any:
+    def ask(self, question: str | Question, default: Any | None = None) -> Any:
         """
         Prompt the user for input.
         """
@@ -157,9 +152,7 @@ def ask(
 
         return question.ask(self._io)
 
-    def secret(
-        self, question: Union[str, "Question"], default: Optional[Any] = None
-    ) -> Any:
+    def secret(self, question: str | Question, default: Any | None = None) -> Any:
         """
         Prompt the user for input but hide the answer from the console.
         """
@@ -175,9 +168,9 @@ def secret(
     def choice(
         self,
         question: str,
-        choices: List[str],
-        default: Optional[Any] = None,
-        attempts: Optional[int] = None,
+        choices: list[str],
+        default: Any | None = None,
+        attempts: int | None = None,
         multiple: bool = False,
     ) -> Any:
         """
@@ -225,7 +218,7 @@ def table(self, header=None, rows=None, style=None):
 
         return table
 
-    def table_separator(self) -> "TableSeparator":
+    def table_separator(self) -> TableSeparator:
         """
         Return a TableSeparator instance.
         """
@@ -241,7 +234,7 @@ def render_table(self, headers, rows, style=None) -> None:
 
         table.render()
 
-    def write(self, text: str, style: Optional[str] = None) -> None:
+    def write(self, text: str, style: str | None = None) -> None:
         """
         Writes a string without a new line.
         Useful if you want to use overwrite().
@@ -256,7 +249,7 @@ def write(self, text: str, style: Optional[str] = None) -> None:
     def line(
         self,
         text: str,
-        style: Optional[str] = None,
+        style: str | None = None,
         verbosity: Verbosity = Verbosity.NORMAL,
     ) -> None:
         """
@@ -272,7 +265,7 @@ def line(
     def line_error(
         self,
         text: str,
-        style: Optional[str] = None,
+        style: str | None = None,
         verbosity: Verbosity = Verbosity.NORMAL,
     ) -> None:
         """
@@ -312,7 +305,7 @@ def question(self, text: str) -> None:
         """
         self.line(text, "question")
 
-    def progress_bar(self, max: int = 0) -> "ProgressBar":
+    def progress_bar(self, max: int = 0) -> ProgressBar:
         """
         Creates a new progress bar
         """
@@ -322,10 +315,10 @@ def progress_bar(self, max: int = 0) -> "ProgressBar":
 
     def progress_indicator(
         self,
-        fmt: Optional[str] = None,
+        fmt: str | None = None,
         interval: int = 100,
-        values: Optional[List[str]] = None,
-    ) -> "ProgressIndicator":
+        values: list[str] | None = None,
+    ) -> ProgressIndicator:
         """
         Creates a new progress indicator.
         """
@@ -337,9 +330,9 @@ def spin(
         self,
         start_message: str,
         end_message: str,
-        fmt: Optional[str] = None,
+        fmt: str | None = None,
         interval=100,
-        values: Optional[List[str]] = None,
+        values: list[str] | None = None,
     ):
         """
         Automatically spin a progress indicator.
@@ -351,9 +344,9 @@ def spin(
     def add_style(
         self,
         name: str,
-        fg: Optional[str] = None,
-        bg: Optional[str] = None,
-        options: Optional[List[str]] = None,
+        fg: str | None = None,
+        bg: str | None = None,
+        options: list[str] | None = None,
     ) -> None:
         """
         Adds a new style