Skip to content

Commit ed9f70c

Browse files
ilevkivskyiJelleZijlstra
authored andcommitted
Replace frozenset with FrozenSet (#1057)
1 parent 25464cf commit ed9f70c

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

stdlib/2/__builtin__.pyi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -625,22 +625,22 @@ class frozenset(AbstractSet[_T], Generic[_T]):
625625
def __init__(self) -> None: ...
626626
@overload
627627
def __init__(self, iterable: Iterable[_T]) -> None: ...
628-
def copy(self) -> frozenset[_T]: ...
629-
def difference(self, *s: Iterable[Any]) -> frozenset[_T]: ...
630-
def intersection(self, *s: Iterable[Any]) -> frozenset[_T]: ...
628+
def copy(self) -> FrozenSet[_T]: ...
629+
def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
630+
def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
631631
def isdisjoint(self, s: Iterable[_T]) -> bool: ...
632632
def issubset(self, s: Iterable[Any]) -> bool: ...
633633
def issuperset(self, s: Iterable[Any]) -> bool: ...
634-
def symmetric_difference(self, s: Iterable[_T]) -> frozenset[_T]: ...
635-
def union(self, *s: Iterable[_T]) -> frozenset[_T]: ...
634+
def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ...
635+
def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ...
636636
def __len__(self) -> int: ...
637637
def __contains__(self, o: object) -> bool: ...
638638
def __iter__(self) -> Iterator[_T]: ...
639639
def __str__(self) -> str: ...
640-
def __and__(self, s: AbstractSet[_T]) -> frozenset[_T]: ...
641-
def __or__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ...
642-
def __sub__(self, s: AbstractSet[_T]) -> frozenset[_T]: ...
643-
def __xor__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ...
640+
def __and__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
641+
def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
642+
def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
643+
def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
644644
def __le__(self, s: AbstractSet[Any]) -> bool: ...
645645
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
646646
def __ge__(self, s: AbstractSet[Any]) -> bool: ...

stdlib/2/typing.pyi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ List = TypeAlias(object)
3131
Dict = TypeAlias(object)
3232
DefaultDict = TypeAlias(object)
3333
Set = TypeAlias(object)
34+
FrozenSet = TypeAlias(object)
3435
Counter = TypeAlias(object)
3536
Deque = TypeAlias(object)
3637

@@ -164,8 +165,6 @@ class AbstractSet(Sized, Iterable[_T_co], Container[_T_co], Generic[_T_co]):
164165
# TODO: argument can be any container?
165166
def isdisjoint(self, s: AbstractSet[Any]) -> bool: ...
166167

167-
class FrozenSet(AbstractSet[_T_co], Generic[_T_co]): ...
168-
169168
class MutableSet(AbstractSet[_T], Generic[_T]):
170169
@abstractmethod
171170
def add(self, x: _T) -> None: ...

stdlib/3/builtins.pyi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -672,22 +672,22 @@ class set(MutableSet[_T], Generic[_T]):
672672

673673
class frozenset(AbstractSet[_T], Generic[_T]):
674674
def __init__(self, iterable: Iterable[_T] = ...) -> None: ...
675-
def copy(self) -> frozenset[_T]: ...
676-
def difference(self, *s: Iterable[Any]) -> frozenset[_T]: ...
677-
def intersection(self, *s: Iterable[Any]) -> frozenset[_T]: ...
675+
def copy(self) -> FrozenSet[_T]: ...
676+
def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
677+
def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ...
678678
def isdisjoint(self, s: Iterable[_T]) -> bool: ...
679679
def issubset(self, s: Iterable[Any]) -> bool: ...
680680
def issuperset(self, s: Iterable[Any]) -> bool: ...
681-
def symmetric_difference(self, s: Iterable[_T]) -> frozenset[_T]: ...
682-
def union(self, *s: Iterable[_T]) -> frozenset[_T]: ...
681+
def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ...
682+
def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ...
683683
def __len__(self) -> int: ...
684684
def __contains__(self, o: object) -> bool: ...
685685
def __iter__(self) -> Iterator[_T]: ...
686686
def __str__(self) -> str: ...
687-
def __and__(self, s: AbstractSet[_T]) -> frozenset[_T]: ...
688-
def __or__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ...
689-
def __sub__(self, s: AbstractSet[_T]) -> frozenset[_T]: ...
690-
def __xor__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ...
687+
def __and__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
688+
def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
689+
def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ...
690+
def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ...
691691
def __le__(self, s: AbstractSet[Any]) -> bool: ...
692692
def __lt__(self, s: AbstractSet[Any]) -> bool: ...
693693
def __ge__(self, s: AbstractSet[Any]) -> bool: ...

stdlib/3/typing.pyi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ List = TypeAlias(object)
3232
Dict = TypeAlias(object)
3333
DefaultDict = TypeAlias(object)
3434
Set = TypeAlias(object)
35+
FrozenSet = TypeAlias(object)
3536
Counter = TypeAlias(object)
3637
Deque = TypeAlias(object)
3738
if sys.version_info >= (3, 3):
@@ -240,8 +241,6 @@ class AbstractSet(_Collection[_T_co], Generic[_T_co]):
240241
# TODO: Argument can be a more general ABC?
241242
def isdisjoint(self, s: AbstractSet[Any]) -> bool: ...
242243

243-
class FrozenSet(AbstractSet[_T_co], Generic[_T_co]): ...
244-
245244
class MutableSet(AbstractSet[_T], Generic[_T]):
246245
@abstractmethod
247246
def add(self, x: _T) -> None: ...

0 commit comments

Comments
 (0)