Skip to content

Commit 4491e41

Browse files
ilinumJelleZijlstra
ilinum
authored and
JelleZijlstra
committed
Make operations on set take AbstractSet[object] (#1533)
Previously they were `AbstractSet[Any]`
1 parent 46a73bb commit 4491e41

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎stdlib/2/__builtin__.pyi

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,9 @@ class set(MutableSet[_T], Generic[_T]):
600600
def discard(self, element: _T) -> None: ...
601601
def intersection(self, *s: Iterable[Any]) -> Set[_T]: ...
602602
def intersection_update(self, *s: Iterable[Any]) -> None: ...
603-
def isdisjoint(self, s: Iterable[Any]) -> bool: ...
604-
def issubset(self, s: Iterable[Any]) -> bool: ...
605-
def issuperset(self, s: Iterable[Any]) -> bool: ...
603+
def isdisjoint(self, s: Iterable[object]) -> bool: ...
604+
def issubset(self, s: Iterable[object]) -> bool: ...
605+
def issuperset(self, s: Iterable[object]) -> bool: ...
606606
def pop(self) -> _T: ...
607607
def remove(self, element: _T) -> None: ...
608608
def symmetric_difference(self, s: Iterable[_T]) -> Set[_T]: ...
@@ -613,18 +613,18 @@ class set(MutableSet[_T], Generic[_T]):
613613
def __contains__(self, o: object) -> bool: ...
614614
def __iter__(self) -> Iterator[_T]: ...
615615
def __str__(self) -> str: ...
616-
def __and__(self, s: AbstractSet[Any]) -> Set[_T]: ...
617-
def __iand__(self, s: AbstractSet[Any]) -> Set[_T]: ...
616+
def __and__(self, s: AbstractSet[object]) -> Set[_T]: ...
617+
def __iand__(self, s: AbstractSet[object]) -> Set[_T]: ...
618618
def __or__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
619619
def __ior__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
620-
def __sub__(self, s: AbstractSet[Any]) -> Set[_T]: ...
621-
def __isub__(self, s: AbstractSet[Any]) -> Set[_T]: ...
620+
def __sub__(self, s: AbstractSet[object]) -> Set[_T]: ...
621+
def __isub__(self, s: AbstractSet[object]) -> Set[_T]: ...
622622
def __xor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
623623
def __ixor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
624-
def __le__(self, s: AbstractSet[Any]) -> bool: ...
625-
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
626-
def __ge__(self, s: AbstractSet[Any]) -> bool: ...
627-
def __gt__(self, s: AbstractSet[Any]) -> bool: ...
624+
def __le__(self, s: AbstractSet[object]) -> bool: ...
625+
def __lt__(self, s: AbstractSet[object]) -> bool: ...
626+
def __ge__(self, s: AbstractSet[object]) -> bool: ...
627+
def __gt__(self, s: AbstractSet[object]) -> bool: ...
628628
# TODO more set operations
629629

630630
class frozenset(AbstractSet[_T], Generic[_T]):
@@ -633,11 +633,11 @@ class frozenset(AbstractSet[_T], Generic[_T]):
633633
@overload
634634
def __init__(self, iterable: Iterable[_T]) -> None: ...
635635
def copy(self) -> FrozenSet[_T]: ...
636-
def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
637-
def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
636+
def difference(self, *s: Iterable[object]) -> FrozenSet[_T]: ...
637+
def intersection(self, *s: Iterable[object]) -> FrozenSet[_T]: ...
638638
def isdisjoint(self, s: Iterable[_T]) -> bool: ...
639-
def issubset(self, s: Iterable[Any]) -> bool: ...
640-
def issuperset(self, s: Iterable[Any]) -> bool: ...
639+
def issubset(self, s: Iterable[object]) -> bool: ...
640+
def issuperset(self, s: Iterable[object]) -> bool: ...
641641
def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ...
642642
def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ...
643643
def __len__(self) -> int: ...
@@ -648,10 +648,10 @@ class frozenset(AbstractSet[_T], Generic[_T]):
648648
def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
649649
def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
650650
def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
651-
def __le__(self, s: AbstractSet[Any]) -> bool: ...
652-
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
653-
def __ge__(self, s: AbstractSet[Any]) -> bool: ...
654-
def __gt__(self, s: AbstractSet[Any]) -> bool: ...
651+
def __le__(self, s: AbstractSet[object]) -> bool: ...
652+
def __lt__(self, s: AbstractSet[object]) -> bool: ...
653+
def __ge__(self, s: AbstractSet[object]) -> bool: ...
654+
def __gt__(self, s: AbstractSet[object]) -> bool: ...
655655

656656
class enumerate(Iterator[Tuple[int, _T]], Generic[_T]):
657657
def __init__(self, iterable: Iterable[_T], start: int = 0) -> None: ...

‎stdlib/3/builtins.pyi

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -665,10 +665,10 @@ class set(MutableSet[_T], Generic[_T]):
665665
def add(self, element: _T) -> None: ...
666666
def clear(self) -> None: ...
667667
def copy(self) -> Set[_T]: ...
668-
def difference(self, *s: Iterable[Any]) -> Set[_T]: ...
669-
def difference_update(self, *s: Iterable[Any]) -> None: ...
668+
def difference(self, *s: Iterable[object]) -> Set[_T]: ...
669+
def difference_update(self, *s: Iterable[object]) -> None: ...
670670
def discard(self, element: _T) -> None: ...
671-
def intersection(self, *s: Iterable[Any]) -> Set[_T]: ...
671+
def intersection(self, *s: Iterable[object]) -> Set[_T]: ...
672672
def intersection_update(self, *s: Iterable[Any]) -> None: ...
673673
def isdisjoint(self, s: Iterable[Any]) -> bool: ...
674674
def issubset(self, s: Iterable[Any]) -> bool: ...
@@ -683,28 +683,28 @@ class set(MutableSet[_T], Generic[_T]):
683683
def __contains__(self, o: object) -> bool: ...
684684
def __iter__(self) -> Iterator[_T]: ...
685685
def __str__(self) -> str: ...
686-
def __and__(self, s: AbstractSet[Any]) -> Set[_T]: ...
687-
def __iand__(self, s: AbstractSet[Any]) -> Set[_T]: ...
686+
def __and__(self, s: AbstractSet[object]) -> Set[_T]: ...
687+
def __iand__(self, s: AbstractSet[object]) -> Set[_T]: ...
688688
def __or__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
689689
def __ior__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
690-
def __sub__(self, s: AbstractSet[Any]) -> Set[_T]: ...
691-
def __isub__(self, s: AbstractSet[Any]) -> Set[_T]: ...
690+
def __sub__(self, s: AbstractSet[object]) -> Set[_T]: ...
691+
def __isub__(self, s: AbstractSet[object]) -> Set[_T]: ...
692692
def __xor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
693693
def __ixor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ...
694-
def __le__(self, s: AbstractSet[Any]) -> bool: ...
695-
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
696-
def __ge__(self, s: AbstractSet[Any]) -> bool: ...
697-
def __gt__(self, s: AbstractSet[Any]) -> bool: ...
694+
def __le__(self, s: AbstractSet[object]) -> bool: ...
695+
def __lt__(self, s: AbstractSet[object]) -> bool: ...
696+
def __ge__(self, s: AbstractSet[object]) -> bool: ...
697+
def __gt__(self, s: AbstractSet[object]) -> bool: ...
698698
# TODO more set operations
699699

700700
class frozenset(AbstractSet[_T], Generic[_T]):
701701
def __init__(self, iterable: Iterable[_T] = ...) -> None: ...
702702
def copy(self) -> FrozenSet[_T]: ...
703-
def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
704-
def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
703+
def difference(self, *s: Iterable[object]) -> FrozenSet[_T]: ...
704+
def intersection(self, *s: Iterable[object]) -> FrozenSet[_T]: ...
705705
def isdisjoint(self, s: Iterable[_T]) -> bool: ...
706-
def issubset(self, s: Iterable[Any]) -> bool: ...
707-
def issuperset(self, s: Iterable[Any]) -> bool: ...
706+
def issubset(self, s: Iterable[object]) -> bool: ...
707+
def issuperset(self, s: Iterable[object]) -> bool: ...
708708
def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ...
709709
def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ...
710710
def __len__(self) -> int: ...
@@ -715,10 +715,10 @@ class frozenset(AbstractSet[_T], Generic[_T]):
715715
def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
716716
def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
717717
def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
718-
def __le__(self, s: AbstractSet[Any]) -> bool: ...
719-
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
720-
def __ge__(self, s: AbstractSet[Any]) -> bool: ...
721-
def __gt__(self, s: AbstractSet[Any]) -> bool: ...
718+
def __le__(self, s: AbstractSet[object]) -> bool: ...
719+
def __lt__(self, s: AbstractSet[object]) -> bool: ...
720+
def __ge__(self, s: AbstractSet[object]) -> bool: ...
721+
def __gt__(self, s: AbstractSet[object]) -> bool: ...
722722

723723
class enumerate(Iterator[Tuple[int, _T]], Generic[_T]):
724724
def __init__(self, iterable: Iterable[_T], start: int = 0) -> None: ...

0 commit comments

Comments
 (0)