mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-08 04:54:47 +08:00
collections/typing: fix various arg names (#4258)
This feels nervous, but if it passes unit tests it's unlikely to break anything
This commit is contained in:
@@ -302,15 +302,15 @@ class Sequence(_Collection[_T_co], Reversible[_T_co], Generic[_T_co]):
|
||||
@abstractmethod
|
||||
def __getitem__(self, s: slice) -> Sequence[_T_co]: ...
|
||||
# Mixin methods
|
||||
def index(self, x: Any, start: int = ..., end: int = ...) -> int: ...
|
||||
def count(self, x: Any) -> int: ...
|
||||
def index(self, value: Any, start: int = ..., stop: int = ...) -> int: ...
|
||||
def count(self, value: Any) -> int: ...
|
||||
def __contains__(self, x: object) -> bool: ...
|
||||
def __iter__(self) -> Iterator[_T_co]: ...
|
||||
def __reversed__(self) -> Iterator[_T_co]: ...
|
||||
|
||||
class MutableSequence(Sequence[_T], Generic[_T]):
|
||||
@abstractmethod
|
||||
def insert(self, index: int, object: _T) -> None: ...
|
||||
def insert(self, index: int, value: _T) -> None: ...
|
||||
@overload
|
||||
@abstractmethod
|
||||
def __getitem__(self, i: int) -> _T: ...
|
||||
@@ -330,12 +330,12 @@ class MutableSequence(Sequence[_T], Generic[_T]):
|
||||
@abstractmethod
|
||||
def __delitem__(self, i: slice) -> None: ...
|
||||
# Mixin methods
|
||||
def append(self, object: _T) -> None: ...
|
||||
def append(self, value: _T) -> None: ...
|
||||
def clear(self) -> None: ...
|
||||
def extend(self, iterable: Iterable[_T]) -> None: ...
|
||||
def extend(self, values: Iterable[_T]) -> None: ...
|
||||
def reverse(self) -> None: ...
|
||||
def pop(self, index: int = ...) -> _T: ...
|
||||
def remove(self, object: _T) -> None: ...
|
||||
def remove(self, value: _T) -> None: ...
|
||||
def __iadd__(self, x: Iterable[_T]) -> MutableSequence[_T]: ...
|
||||
|
||||
class AbstractSet(_Collection[_T_co], Generic[_T_co]):
|
||||
@@ -350,17 +350,17 @@ class AbstractSet(_Collection[_T_co], Generic[_T_co]):
|
||||
def __or__(self, s: AbstractSet[_T]) -> AbstractSet[Union[_T_co, _T]]: ...
|
||||
def __sub__(self, s: AbstractSet[Any]) -> AbstractSet[_T_co]: ...
|
||||
def __xor__(self, s: AbstractSet[_T]) -> AbstractSet[Union[_T_co, _T]]: ...
|
||||
def isdisjoint(self, s: Iterable[Any]) -> bool: ...
|
||||
def isdisjoint(self, other: Iterable[Any]) -> bool: ...
|
||||
|
||||
class MutableSet(AbstractSet[_T], Generic[_T]):
|
||||
@abstractmethod
|
||||
def add(self, x: _T) -> None: ...
|
||||
def add(self, value: _T) -> None: ...
|
||||
@abstractmethod
|
||||
def discard(self, x: _T) -> None: ...
|
||||
def discard(self, value: _T) -> None: ...
|
||||
# Mixin methods
|
||||
def clear(self) -> None: ...
|
||||
def pop(self) -> _T: ...
|
||||
def remove(self, element: _T) -> None: ...
|
||||
def remove(self, value: _T) -> None: ...
|
||||
def __ior__(self, s: AbstractSet[_S]) -> MutableSet[Union[_T, _S]]: ...
|
||||
def __iand__(self, s: AbstractSet[Any]) -> MutableSet[_T]: ...
|
||||
def __ixor__(self, s: AbstractSet[_S]) -> MutableSet[Union[_T, _S]]: ...
|
||||
@@ -432,9 +432,9 @@ class Mapping(_Collection[_KT], Generic[_KT, _VT_co]):
|
||||
...
|
||||
# Mixin methods
|
||||
@overload
|
||||
def get(self, k: _KT) -> Optional[_VT_co]: ...
|
||||
def get(self, key: _KT) -> Optional[_VT_co]: ...
|
||||
@overload
|
||||
def get(self, k: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]: ...
|
||||
def get(self, key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]: ...
|
||||
def items(self) -> AbstractSet[Tuple[_KT, _VT_co]]: ...
|
||||
def keys(self) -> AbstractSet[_KT]: ...
|
||||
def values(self) -> ValuesView[_VT_co]: ...
|
||||
@@ -448,11 +448,11 @@ class MutableMapping(Mapping[_KT, _VT], Generic[_KT, _VT]):
|
||||
|
||||
def clear(self) -> None: ...
|
||||
@overload
|
||||
def pop(self, k: _KT) -> _VT: ...
|
||||
def pop(self, key: _KT) -> _VT: ...
|
||||
@overload
|
||||
def pop(self, k: _KT, default: Union[_VT, _T] = ...) -> Union[_VT, _T]: ...
|
||||
def pop(self, key: _KT, default: Union[_VT, _T] = ...) -> Union[_VT, _T]: ...
|
||||
def popitem(self) -> Tuple[_KT, _VT]: ...
|
||||
def setdefault(self, k: _KT, default: _VT = ...) -> _VT: ...
|
||||
def setdefault(self, key: _KT, default: _VT = ...) -> _VT: ...
|
||||
# 'update' used to take a Union, but using overloading is better.
|
||||
# The second overloaded type here is a bit too general, because
|
||||
# Mapping[Tuple[_KT, _VT], W] is a subclass of Iterable[Tuple[_KT, _VT]],
|
||||
|
||||
Reference in New Issue
Block a user