Merge branch 'main' into benchatt/pythongh-11990-more-argparse

benchatt · May 23, 2024 · aa07ae9 · aa07ae9
2 parents 6fa9a04 + cf4678c
commit aa07ae9
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 34 deletions.
diff --git a/stdlib/@tests/stubtest_allowlists/py313.txt b/stdlib/@tests/stubtest_allowlists/py313.txt
@@ -37,10 +37,6 @@ _thread.start_new_thread
 _tkinter.TkappType.gettrace
 _tkinter.TkappType.settrace
 _tkinter.create
-argparse.Action.__init__
-argparse.BooleanOptionalAction.__init__
-argparse._AppendAction.__init__
-argparse._StoreAction.__init__
 argparse._StoreConstAction.__init__
 argparse._StoreFalseAction.__init__
 argparse._StoreTrueAction.__init__

diff --git a/stdlib/argparse.pyi b/stdlib/argparse.pyi
@@ -318,51 +318,95 @@ class Action(_AttributeHolder):
     required: bool
     help: str | None
     metavar: str | tuple[str, ...] | None
-    def __init__(
-        self,
-        option_strings: Sequence[str],
-        dest: str,
-        nargs: int | str | None = None,
-        const: _T | None = None,
-        default: _T | str | None = None,
-        type: Callable[[str], _T] | FileType | None = None,
-        choices: Iterable[_T] | None = None,
-        required: bool = False,
-        help: str | None = None,
-        metavar: str | tuple[str, ...] | None = None,
-    ) -> None: ...
-    def __call__(
-        self, parser: ArgumentParser, namespace: Namespace, values: str | Sequence[Any] | None, option_string: str | None = None
-    ) -> None: ...
-    if sys.version_info >= (3, 9):
-        def format_usage(self) -> str: ...
-
-if sys.version_info >= (3, 12):
-    class BooleanOptionalAction(Action):
-        @overload
+    if sys.version_info >= (3, 13):
         def __init__(
             self,
             option_strings: Sequence[str],
             dest: str,
-            default: bool | None = None,
-            *,
+            nargs: int | str | None = None,
+            const: _T | None = None,
+            default: _T | str | None = None,
+            type: Callable[[str], _T] | FileType | None = None,
+            choices: Iterable[_T] | None = None,
             required: bool = False,
             help: str | None = None,
+            metavar: str | tuple[str, ...] | None = None,
+            deprecated: bool = False,
         ) -> None: ...
-        @overload
-        @deprecated("The `type`, `choices`, and `metavar` parameters are ignored and will be removed in Python 3.14.")
+    else:
         def __init__(
             self,
             option_strings: Sequence[str],
             dest: str,
-            default: _T | bool | None = None,
-            type: Callable[[str], _T] | FileType | None = sentinel,
-            choices: Iterable[_T] | None = sentinel,
+            nargs: int | str | None = None,
+            const: _T | None = None,
+            default: _T | str | None = None,
+            type: Callable[[str], _T] | FileType | None = None,
+            choices: Iterable[_T] | None = None,
             required: bool = False,
             help: str | None = None,
-            metavar: str | tuple[str, ...] | None = sentinel,
+            metavar: str | tuple[str, ...] | None = None,
         ) -> None: ...
 
+    def __call__(
+        self, parser: ArgumentParser, namespace: Namespace, values: str | Sequence[Any] | None, option_string: str | None = None
+    ) -> None: ...
+    if sys.version_info >= (3, 9):
+        def format_usage(self) -> str: ...
+
+if sys.version_info >= (3, 12):
+    class BooleanOptionalAction(Action):
+        if sys.version_info >= (3, 13):
+            @overload
+            def __init__(
+                self,
+                option_strings: Sequence[str],
+                dest: str,
+                default: bool | None = None,
+                *,
+                required: bool = False,
+                help: str | None = None,
+                deprecated: bool = False,
+            ) -> None: ...
+            @overload
+            @deprecated("The `type`, `choices`, and `metavar` parameters are ignored and will be removed in Python 3.14.")
+            def __init__(
+                self,
+                option_strings: Sequence[str],
+                dest: str,
+                default: _T | bool | None = None,
+                type: Callable[[str], _T] | FileType | None = sentinel,
+                choices: Iterable[_T] | None = sentinel,
+                required: bool = False,
+                help: str | None = None,
+                metavar: str | tuple[str, ...] | None = sentinel,
+                deprecated: bool = False,
+            ) -> None: ...
+        else:
+            @overload
+            def __init__(
+                self,
+                option_strings: Sequence[str],
+                dest: str,
+                default: bool | None = None,
+                *,
+                required: bool = False,
+                help: str | None = None,
+            ) -> None: ...
+            @overload
+            @deprecated("The `type`, `choices`, and `metavar` parameters are ignored and will be removed in Python 3.14.")
+            def __init__(
+                self,
+                option_strings: Sequence[str],
+                dest: str,
+                default: _T | bool | None = None,
+                type: Callable[[str], _T] | FileType | None = sentinel,
+                choices: Iterable[_T] | None = sentinel,
+                required: bool = False,
+                help: str | None = None,
+                metavar: str | tuple[str, ...] | None = sentinel,
+            ) -> None: ...
+
 elif sys.version_info >= (3, 9):
     class BooleanOptionalAction(Action):
         @overload