Merge branch 'main' into prompt-toolkit

Author: tleonhardt

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         exclude: ^examples/transcripts/
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.13"
+    rev: "v0.14.14"
     hooks:
       - id: ruff-format
         args: [--config=ruff.toml]

cmd2/argparse_custom.py

@@ -293,6 +293,7 @@ def get_items(self) -> list[CompletionItems]:
     RawTextRichHelpFormatter,
     RichHelpFormatter,
 )
+from typing_extensions import Self
 
 from . import constants
 from . import rich_utils as ru
@@ -380,7 +381,7 @@ class CompletionItem(str):  # noqa: SLOT000
     See header of this file for more information
     """
 
-    def __new__(cls, value: object, *_args: Any, **_kwargs: Any) -> 'CompletionItem':
+    def __new__(cls, value: object, *_args: Any, **_kwargs: Any) -> Self:
         """Responsible for creating and returning a new instance, called before __init__ when an object is instantiated."""
         return super().__new__(cls, value)
 

cmd2/parsing.py

@@ -9,6 +9,8 @@
 )
 from typing import Any
 
+from typing_extensions import Self
+
 from . import (
     constants,
     utils,
@@ -144,7 +146,7 @@ class Statement(str):  # noqa: SLOT000
     # Used in JSON dictionaries
     _args_field = 'args'
 
-    def __new__(cls, value: object, *_pos_args: Any, **_kw_args: Any) -> 'Statement':
+    def __new__(cls, value: object, *_pos_args: Any, **_kw_args: Any) -> Self:
         """Create a new instance of Statement.
 
         We must override __new__ because we are subclassing `str` which is