mirror of
https://github.com/davidhalter/typeshed.git
synced 2026-01-24 03:51:52 +08:00
Big diff: Use new "|" union syntax (#5872)
This commit is contained in:
Akuli
@@ -8,14 +8,12 @@ from typing import (
|
||||
Iterable,
|
||||
List,
|
||||
NoReturn,
|
||||
Optional,
|
||||
Pattern,
|
||||
Protocol,
|
||||
Sequence,
|
||||
Tuple,
|
||||
Type,
|
||||
TypeVar,
|
||||
Union,
|
||||
overload,
|
||||
)
|
||||
|
||||
@@ -32,9 +30,9 @@ ZERO_OR_MORE: str
|
||||
_UNRECOGNIZED_ARGS_ATTR: str # undocumented
|
||||
|
||||
class ArgumentError(Exception):
|
||||
argument_name: Optional[str]
|
||||
argument_name: str | None
|
||||
message: str
|
||||
def __init__(self, argument: Optional[Action], message: str) -> None: ...
|
||||
def __init__(self, argument: Action | None, message: str) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _AttributeHolder:
|
||||
@@ -43,7 +41,7 @@ class _AttributeHolder:
|
||||
|
||||
# undocumented
|
||||
class _ActionsContainer:
|
||||
description: Optional[str]
|
||||
description: str | None
|
||||
prefix_chars: str
|
||||
argument_default: Any
|
||||
conflict_handler: str
|
||||
@@ -56,7 +54,7 @@ class _ActionsContainer:
|
||||
_defaults: Dict[str, Any]
|
||||
_negative_number_matcher: Pattern[str]
|
||||
_has_negative_number_optionals: List[bool]
|
||||
def __init__(self, description: Optional[str], prefix_chars: str, argument_default: Any, conflict_handler: str) -> None: ...
|
||||
def __init__(self, description: str | None, prefix_chars: str, argument_default: Any, conflict_handler: str) -> None: ...
|
||||
def register(self, registry_name: str, value: Any, object: Any) -> None: ...
|
||||
def _registry_get(self, registry_name: str, value: Any, default: Any = ...) -> Any: ...
|
||||
def set_defaults(self, **kwargs: Any) -> None: ...
|
||||
@@ -64,16 +62,16 @@ class _ActionsContainer:
|
||||
def add_argument(
|
||||
self,
|
||||
*name_or_flags: str,
|
||||
action: Union[str, Type[Action]] = ...,
|
||||
nargs: Union[int, str] = ...,
|
||||
action: str | Type[Action] = ...,
|
||||
nargs: int | str = ...,
|
||||
const: Any = ...,
|
||||
default: Any = ...,
|
||||
type: Union[Callable[[str], _T], Callable[[str], _T], FileType] = ...,
|
||||
choices: Optional[Iterable[_T]] = ...,
|
||||
type: Callable[[str], _T] | Callable[[str], _T] | FileType = ...,
|
||||
choices: Iterable[_T] | None = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
dest: Optional[str] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
dest: str | None = ...,
|
||||
version: str = ...,
|
||||
**kwargs: Any,
|
||||
) -> Action: ...
|
||||
@@ -84,7 +82,7 @@ class _ActionsContainer:
|
||||
def _add_container_actions(self, container: _ActionsContainer) -> None: ...
|
||||
def _get_positional_kwargs(self, dest: str, **kwargs: Any) -> Dict[str, Any]: ...
|
||||
def _get_optional_kwargs(self, *args: Any, **kwargs: Any) -> Dict[str, Any]: ...
|
||||
def _pop_action_class(self, kwargs: Any, default: Optional[Type[Action]] = ...) -> Type[Action]: ...
|
||||
def _pop_action_class(self, kwargs: Any, default: Type[Action] | None = ...) -> Type[Action]: ...
|
||||
def _get_handler(self) -> Callable[[Action, Iterable[Tuple[str, Action]]], Any]: ...
|
||||
def _check_conflict(self, action: Action) -> None: ...
|
||||
def _handle_conflict_error(self, action: Action, conflicting_actions: Iterable[Tuple[str, Action]]) -> NoReturn: ...
|
||||
@@ -95,29 +93,29 @@ class _FormatterClass(Protocol):
|
||||
|
||||
class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||
prog: str
|
||||
usage: Optional[str]
|
||||
epilog: Optional[str]
|
||||
usage: str | None
|
||||
epilog: str | None
|
||||
formatter_class: _FormatterClass
|
||||
fromfile_prefix_chars: Optional[str]
|
||||
fromfile_prefix_chars: str | None
|
||||
add_help: bool
|
||||
allow_abbrev: bool
|
||||
|
||||
# undocumented
|
||||
_positionals: _ArgumentGroup
|
||||
_optionals: _ArgumentGroup
|
||||
_subparsers: Optional[_ArgumentGroup]
|
||||
_subparsers: _ArgumentGroup | None
|
||||
|
||||
if sys.version_info >= (3, 9):
|
||||
def __init__(
|
||||
self,
|
||||
prog: Optional[str] = ...,
|
||||
usage: Optional[str] = ...,
|
||||
description: Optional[str] = ...,
|
||||
epilog: Optional[str] = ...,
|
||||
prog: str | None = ...,
|
||||
usage: str | None = ...,
|
||||
description: str | None = ...,
|
||||
epilog: str | None = ...,
|
||||
parents: Sequence[ArgumentParser] = ...,
|
||||
formatter_class: _FormatterClass = ...,
|
||||
prefix_chars: str = ...,
|
||||
fromfile_prefix_chars: Optional[str] = ...,
|
||||
fromfile_prefix_chars: str | None = ...,
|
||||
argument_default: Any = ...,
|
||||
conflict_handler: str = ...,
|
||||
add_help: bool = ...,
|
||||
@@ -127,14 +125,14 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||
else:
|
||||
def __init__(
|
||||
self,
|
||||
prog: Optional[str] = ...,
|
||||
usage: Optional[str] = ...,
|
||||
description: Optional[str] = ...,
|
||||
epilog: Optional[str] = ...,
|
||||
prog: str | None = ...,
|
||||
usage: str | None = ...,
|
||||
description: str | None = ...,
|
||||
epilog: str | None = ...,
|
||||
parents: Sequence[ArgumentParser] = ...,
|
||||
formatter_class: _FormatterClass = ...,
|
||||
prefix_chars: str = ...,
|
||||
fromfile_prefix_chars: Optional[str] = ...,
|
||||
fromfile_prefix_chars: str | None = ...,
|
||||
argument_default: Any = ...,
|
||||
conflict_handler: str = ...,
|
||||
add_help: bool = ...,
|
||||
@@ -143,11 +141,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||
# The type-ignores in these overloads should be temporary. See:
|
||||
# https://github.com/python/typeshed/pull/2643#issuecomment-442280277
|
||||
@overload
|
||||
def parse_args(self, args: Optional[Sequence[str]] = ...) -> Namespace: ...
|
||||
def parse_args(self, args: Sequence[str] | None = ...) -> Namespace: ...
|
||||
@overload
|
||||
def parse_args(self, args: Optional[Sequence[str]], namespace: None) -> Namespace: ... # type: ignore
|
||||
def parse_args(self, args: Sequence[str] | None, namespace: None) -> Namespace: ... # type: ignore
|
||||
@overload
|
||||
def parse_args(self, args: Optional[Sequence[str]], namespace: _N) -> _N: ...
|
||||
def parse_args(self, args: Sequence[str] | None, namespace: _N) -> _N: ...
|
||||
@overload
|
||||
def parse_args(self, *, namespace: None) -> Namespace: ... # type: ignore
|
||||
@overload
|
||||
@@ -157,46 +155,44 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||
self,
|
||||
*,
|
||||
title: str = ...,
|
||||
description: Optional[str] = ...,
|
||||
description: str | None = ...,
|
||||
prog: str = ...,
|
||||
parser_class: Type[ArgumentParser] = ...,
|
||||
action: Type[Action] = ...,
|
||||
option_string: str = ...,
|
||||
dest: Optional[str] = ...,
|
||||
dest: str | None = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[str] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | None = ...,
|
||||
) -> _SubParsersAction: ...
|
||||
else:
|
||||
def add_subparsers(
|
||||
self,
|
||||
*,
|
||||
title: str = ...,
|
||||
description: Optional[str] = ...,
|
||||
description: str | None = ...,
|
||||
prog: str = ...,
|
||||
parser_class: Type[ArgumentParser] = ...,
|
||||
action: Type[Action] = ...,
|
||||
option_string: str = ...,
|
||||
dest: Optional[str] = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[str] = ...,
|
||||
dest: str | None = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | None = ...,
|
||||
) -> _SubParsersAction: ...
|
||||
def print_usage(self, file: Optional[IO[str]] = ...) -> None: ...
|
||||
def print_help(self, file: Optional[IO[str]] = ...) -> None: ...
|
||||
def print_usage(self, file: IO[str] | None = ...) -> None: ...
|
||||
def print_help(self, file: IO[str] | None = ...) -> None: ...
|
||||
def format_usage(self) -> str: ...
|
||||
def format_help(self) -> str: ...
|
||||
def parse_known_args(
|
||||
self, args: Optional[Sequence[str]] = ..., namespace: Optional[Namespace] = ...
|
||||
self, args: Sequence[str] | None = ..., namespace: Namespace | None = ...
|
||||
) -> Tuple[Namespace, List[str]]: ...
|
||||
def convert_arg_line_to_args(self, arg_line: str) -> List[str]: ...
|
||||
def exit(self, status: int = ..., message: Optional[str] = ...) -> NoReturn: ...
|
||||
def exit(self, status: int = ..., message: str | None = ...) -> NoReturn: ...
|
||||
def error(self, message: str) -> NoReturn: ...
|
||||
if sys.version_info >= (3, 7):
|
||||
def parse_intermixed_args(
|
||||
self, args: Optional[Sequence[str]] = ..., namespace: Optional[Namespace] = ...
|
||||
) -> Namespace: ...
|
||||
def parse_intermixed_args(self, args: Sequence[str] | None = ..., namespace: Namespace | None = ...) -> Namespace: ...
|
||||
def parse_known_intermixed_args(
|
||||
self, args: Optional[Sequence[str]] = ..., namespace: Optional[Namespace] = ...
|
||||
self, args: Sequence[str] | None = ..., namespace: Namespace | None = ...
|
||||
) -> Tuple[Namespace, List[str]]: ...
|
||||
# undocumented
|
||||
def _get_optional_actions(self) -> List[Action]: ...
|
||||
@@ -205,14 +201,14 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||
def _read_args_from_files(self, arg_strings: List[str]) -> List[str]: ...
|
||||
def _match_argument(self, action: Action, arg_strings_pattern: str) -> int: ...
|
||||
def _match_arguments_partial(self, actions: Sequence[Action], arg_strings_pattern: str) -> List[int]: ...
|
||||
def _parse_optional(self, arg_string: str) -> Optional[Tuple[Optional[Action], str, Optional[str]]]: ...
|
||||
def _get_option_tuples(self, option_string: str) -> List[Tuple[Action, str, Optional[str]]]: ...
|
||||
def _parse_optional(self, arg_string: str) -> Tuple[Action | None, str, str | None] | None: ...
|
||||
def _get_option_tuples(self, option_string: str) -> List[Tuple[Action, str, str | None]]: ...
|
||||
def _get_nargs_pattern(self, action: Action) -> str: ...
|
||||
def _get_values(self, action: Action, arg_strings: List[str]) -> Any: ...
|
||||
def _get_value(self, action: Action, arg_string: str) -> Any: ...
|
||||
def _check_value(self, action: Action, value: Any) -> None: ...
|
||||
def _get_formatter(self) -> HelpFormatter: ...
|
||||
def _print_message(self, message: str, file: Optional[IO[str]] = ...) -> None: ...
|
||||
def _print_message(self, message: str, file: IO[str] | None = ...) -> None: ...
|
||||
|
||||
class HelpFormatter:
|
||||
# undocumented
|
||||
@@ -228,24 +224,22 @@ class HelpFormatter:
|
||||
_whitespace_matcher: Pattern[str]
|
||||
_long_break_matcher: Pattern[str]
|
||||
_Section: Type[Any] # Nested class
|
||||
def __init__(
|
||||
self, prog: str, indent_increment: int = ..., max_help_position: int = ..., width: Optional[int] = ...
|
||||
) -> None: ...
|
||||
def __init__(self, prog: str, indent_increment: int = ..., max_help_position: int = ..., width: int | None = ...) -> None: ...
|
||||
def _indent(self) -> None: ...
|
||||
def _dedent(self) -> None: ...
|
||||
def _add_item(self, func: Callable[..., str], args: Iterable[Any]) -> None: ...
|
||||
def start_section(self, heading: Optional[str]) -> None: ...
|
||||
def start_section(self, heading: str | None) -> None: ...
|
||||
def end_section(self) -> None: ...
|
||||
def add_text(self, text: Optional[str]) -> None: ...
|
||||
def add_text(self, text: str | None) -> None: ...
|
||||
def add_usage(
|
||||
self, usage: Optional[str], actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[str] = ...
|
||||
self, usage: str | None, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: str | None = ...
|
||||
) -> None: ...
|
||||
def add_argument(self, action: Action) -> None: ...
|
||||
def add_arguments(self, actions: Iterable[Action]) -> None: ...
|
||||
def format_help(self) -> str: ...
|
||||
def _join_parts(self, part_strings: Iterable[str]) -> str: ...
|
||||
def _format_usage(
|
||||
self, usage: str, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[str]
|
||||
self, usage: str, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: str | None
|
||||
) -> str: ...
|
||||
def _format_actions_usage(self, actions: Iterable[Action], groups: Iterable[_ArgumentGroup]) -> str: ...
|
||||
def _format_text(self, text: str) -> str: ...
|
||||
@@ -257,7 +251,7 @@ class HelpFormatter:
|
||||
def _iter_indented_subactions(self, action: Action) -> Generator[Action, None, None]: ...
|
||||
def _split_lines(self, text: str, width: int) -> List[str]: ...
|
||||
def _fill_text(self, text: str, width: int, indent: str) -> str: ...
|
||||
def _get_help_string(self, action: Action) -> Optional[str]: ...
|
||||
def _get_help_string(self, action: Action) -> str | None: ...
|
||||
def _get_default_metavar_for_optional(self, action: Action) -> str: ...
|
||||
def _get_default_metavar_for_positional(self, action: Action) -> str: ...
|
||||
|
||||
@@ -269,33 +263,29 @@ class MetavarTypeHelpFormatter(HelpFormatter): ...
|
||||
class Action(_AttributeHolder):
|
||||
option_strings: Sequence[str]
|
||||
dest: str
|
||||
nargs: Optional[Union[int, str]]
|
||||
nargs: int | str | None
|
||||
const: Any
|
||||
default: Any
|
||||
type: Union[Callable[[str], Any], FileType, None]
|
||||
choices: Optional[Iterable[Any]]
|
||||
type: Callable[[str], Any] | FileType | None
|
||||
choices: Iterable[Any] | None
|
||||
required: bool
|
||||
help: Optional[str]
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]]
|
||||
help: str | None
|
||||
metavar: str | Tuple[str, ...] | None
|
||||
def __init__(
|
||||
self,
|
||||
option_strings: Sequence[str],
|
||||
dest: str,
|
||||
nargs: Optional[Union[int, str]] = ...,
|
||||
const: Optional[_T] = ...,
|
||||
default: Union[_T, str, None] = ...,
|
||||
type: Optional[Union[Callable[[str], _T], Callable[[str], _T], FileType]] = ...,
|
||||
choices: Optional[Iterable[_T]] = ...,
|
||||
nargs: int | str | None = ...,
|
||||
const: _T | None = ...,
|
||||
default: _T | str | None = ...,
|
||||
type: Callable[[str], _T] | Callable[[str], _T] | FileType | None = ...,
|
||||
choices: Iterable[_T] | None = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
def __call__(
|
||||
self,
|
||||
parser: ArgumentParser,
|
||||
namespace: Namespace,
|
||||
values: Union[str, Sequence[Any], None],
|
||||
option_string: Optional[str] = ...,
|
||||
self, parser: ArgumentParser, namespace: Namespace, values: str | Sequence[Any] | None, option_string: str | None = ...
|
||||
) -> None: ...
|
||||
if sys.version_info >= (3, 9):
|
||||
def format_usage(self) -> str: ...
|
||||
@@ -306,12 +296,12 @@ if sys.version_info >= (3, 9):
|
||||
self,
|
||||
option_strings: Sequence[str],
|
||||
dest: str,
|
||||
default: Union[_T, str, None] = ...,
|
||||
type: Optional[Union[Callable[[str], _T], Callable[[str], _T], FileType]] = ...,
|
||||
choices: Optional[Iterable[_T]] = ...,
|
||||
default: _T | str | None = ...,
|
||||
type: Callable[[str], _T] | Callable[[str], _T] | FileType | None = ...,
|
||||
choices: Iterable[_T] | None = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
|
||||
class Namespace(_AttributeHolder):
|
||||
@@ -324,19 +314,17 @@ class FileType:
|
||||
# undocumented
|
||||
_mode: str
|
||||
_bufsize: int
|
||||
_encoding: Optional[str]
|
||||
_errors: Optional[str]
|
||||
def __init__(
|
||||
self, mode: str = ..., bufsize: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ...
|
||||
) -> None: ...
|
||||
_encoding: str | None
|
||||
_errors: str | None
|
||||
def __init__(self, mode: str = ..., bufsize: int = ..., encoding: str | None = ..., errors: str | None = ...) -> None: ...
|
||||
def __call__(self, string: str) -> IO[Any]: ...
|
||||
|
||||
# undocumented
|
||||
class _ArgumentGroup(_ActionsContainer):
|
||||
title: Optional[str]
|
||||
title: str | None
|
||||
_group_actions: List[Action]
|
||||
def __init__(
|
||||
self, container: _ActionsContainer, title: Optional[str] = ..., description: Optional[str] = ..., **kwargs: Any
|
||||
self, container: _ActionsContainer, title: str | None = ..., description: str | None = ..., **kwargs: Any
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
@@ -357,20 +345,20 @@ class _StoreConstAction(Action):
|
||||
const: Any,
|
||||
default: Any = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _StoreTrueAction(_StoreConstAction):
|
||||
def __init__(
|
||||
self, option_strings: Sequence[str], dest: str, default: bool = ..., required: bool = ..., help: Optional[str] = ...
|
||||
self, option_strings: Sequence[str], dest: str, default: bool = ..., required: bool = ..., help: str | None = ...
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _StoreFalseAction(_StoreConstAction):
|
||||
def __init__(
|
||||
self, option_strings: Sequence[str], dest: str, default: bool = ..., required: bool = ..., help: Optional[str] = ...
|
||||
self, option_strings: Sequence[str], dest: str, default: bool = ..., required: bool = ..., help: str | None = ...
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
@@ -385,25 +373,25 @@ class _AppendConstAction(Action):
|
||||
const: Any,
|
||||
default: Any = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _CountAction(Action):
|
||||
def __init__(
|
||||
self, option_strings: Sequence[str], dest: str, default: Any = ..., required: bool = ..., help: Optional[str] = ...
|
||||
self, option_strings: Sequence[str], dest: str, default: Any = ..., required: bool = ..., help: str | None = ...
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _HelpAction(Action):
|
||||
def __init__(self, option_strings: Sequence[str], dest: str = ..., default: str = ..., help: Optional[str] = ...) -> None: ...
|
||||
def __init__(self, option_strings: Sequence[str], dest: str = ..., default: str = ..., help: str | None = ...) -> None: ...
|
||||
|
||||
# undocumented
|
||||
class _VersionAction(Action):
|
||||
version: Optional[str]
|
||||
version: str | None
|
||||
def __init__(
|
||||
self, option_strings: Sequence[str], version: Optional[str] = ..., dest: str = ..., default: str = ..., help: str = ...
|
||||
self, option_strings: Sequence[str], version: str | None = ..., dest: str = ..., default: str = ..., help: str = ...
|
||||
) -> None: ...
|
||||
|
||||
# undocumented
|
||||
@@ -422,8 +410,8 @@ class _SubParsersAction(Action):
|
||||
parser_class: Type[ArgumentParser],
|
||||
dest: str = ...,
|
||||
required: bool = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
else:
|
||||
def __init__(
|
||||
@@ -432,8 +420,8 @@ class _SubParsersAction(Action):
|
||||
prog: str,
|
||||
parser_class: Type[ArgumentParser],
|
||||
dest: str = ...,
|
||||
help: Optional[str] = ...,
|
||||
metavar: Optional[Union[str, Tuple[str, ...]]] = ...,
|
||||
help: str | None = ...,
|
||||
metavar: str | Tuple[str, ...] | None = ...,
|
||||
) -> None: ...
|
||||
# TODO: Type keyword args properly.
|
||||
def add_parser(self, name: str, **kwargs: Any) -> ArgumentParser: ...
|
||||
@@ -447,4 +435,4 @@ if sys.version_info < (3, 7):
|
||||
def _ensure_value(namespace: Namespace, name: str, value: Any) -> Any: ...
|
||||
|
||||
# undocumented
|
||||
def _get_action_name(argument: Optional[Action]) -> Optional[str]: ...
|
||||
def _get_action_name(argument: Action | None) -> str | None: ...
|
||||
|
||||
Reference in New Issue
Block a user