mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-104050: Argument clinic: more misc typing coverage improvements (#107210)

Browse source
This commit is contained in:
Alex Waygood 2023-07-25 09:49:07 +01:00 • committed by GitHub
parent dbfe73837d
commit d9e34db993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Tools/clinic/clinic.py
View file

@ -437,7 +437,9 @@ class FormatCounterFormatter(string.Formatter):
def __init__(self) -> None: def __init__(self) -> None:
self.counts = collections.Counter[str]() self.counts = collections.Counter[str]()
def get_value(self, key: str, args, kwargs) -> str: # type: ignore[override] def get_value(
self, key: str, args: object, kwargs: object # type: ignore[override]
) -> Literal['']:
self.counts[key] += 1 self.counts[key] += 1
return '' return ''
@ -2797,7 +2799,7 @@ class CConverter(metaclass=CConverterAutoRegister):
# This lets the self_converter overrule the user-settable # This lets the self_converter overrule the user-settable
# name, *just* for the text signature. # name, *just* for the text signature.
# Only set by self_converter. # Only set by self_converter.
signature_name = None signature_name: str | None = None
# keep in sync with self_converter.__init__! # keep in sync with self_converter.__init__!
def __init__(self, def __init__(self,
@ -2811,8 +2813,8 @@ class CConverter(metaclass=CConverterAutoRegister):
py_default: str | None = None, py_default: str | None = None,
annotation: str | Literal[Sentinels.unspecified] = unspecified, annotation: str | Literal[Sentinels.unspecified] = unspecified,
unused: bool = False, unused: bool = False,
**kwargs **kwargs: Any
): ) -> None:
self.name = ensure_legal_c_identifier(name) self.name = ensure_legal_c_identifier(name)
self.py_name = py_name self.py_name = py_name
self.unused = unused self.unused = unused
@ -2849,7 +2851,7 @@ class CConverter(metaclass=CConverterAutoRegister):
self.converter_init(**kwargs) self.converter_init(**kwargs)
self.function = function self.function = function
def converter_init(self): def converter_init(self) -> None:
pass pass
def is_optional(self) -> bool: def is_optional(self) -> bool:
@ -3032,7 +3034,7 @@ class CConverter(metaclass=CConverterAutoRegister):
""" """
return "" return ""
def pre_render(self): def pre_render(self) -> None:
""" """
A second initialization function, like converter_init, A second initialization function, like converter_init,
called just before rendering. called just before rendering.
@ -3169,7 +3171,7 @@ class defining_class_converter(CConverter):
format_unit = '' format_unit = ''
show_in_signature = False show_in_signature = False
def converter_init(self, *, type=None) -> None: def converter_init(self, *, type: str | None = None) -> None:
self.specified_type = type self.specified_type = type
def render(self, parameter, data) -> None: def render(self, parameter, data) -> None:
@ -3321,7 +3323,9 @@ class int_converter(CConverter):
format_unit = 'i' format_unit = 'i'
c_ignored_default = "0" c_ignored_default = "0"
def converter_init(self, *, accept: TypeSet = {int}, type=None) -> None: def converter_init(
self, *, accept: TypeSet = {int}, type: str | None = None
) -> None:
if accept == {str}: if accept == {str}:
self.format_unit = 'C' self.format_unit = 'C'
elif accept != {int}: elif accept != {int}:
@ -3982,14 +3986,15 @@ class self_converter(CConverter):
A special-case converter: A special-case converter:
this is the default converter used for "self". this is the default converter used for "self".
""" """
type = None type: str | None = None
format_unit = '' format_unit = ''
def converter_init(self, *, type: str | None = None) -> None: def converter_init(self, *, type: str | None = None) -> None:
self.specified_type = type self.specified_type = type
def pre_render(self): def pre_render(self) -> None:
f = self.function f = self.function
assert isinstance(f, Function)
default_type, default_name = correct_name_for_self(f) default_type, default_name = correct_name_for_self(f)
self.signature_name = default_name self.signature_name = default_name
self.type = self.specified_type or self.type or default_type self.type = self.specified_type or self.type or default_type
@ -4038,7 +4043,9 @@ class self_converter(CConverter):
# in the impl call. # in the impl call.
@property @property
def parser_type(self): def parser_type(self) -> str:
assert self.type is not None
assert isinstance(self.function, Function)
return required_type_for_self_for_parser(self.function) or self.type return required_type_for_self_for_parser(self.function) or self.type
def render(self, parameter, data): def render(self, parameter, data):