From 52ba61b78b61d28d72278766c5ae0b61079f64c1 Mon Sep 17 00:00:00 2001 From: Ivan Levkivskyi Date: Tue, 21 Mar 2017 14:52:49 +0100 Subject: [PATCH] Replace frozenset with FrozenSet --- stdlib/2/__builtin__.pyi | 18 +++++++++--------- stdlib/2/typing.pyi | 3 +-- stdlib/3/builtins.pyi | 18 +++++++++--------- stdlib/3/typing.pyi | 3 +-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/stdlib/2/__builtin__.pyi b/stdlib/2/__builtin__.pyi index 54953eb17bc1..f9370cacf31c 100644 --- a/stdlib/2/__builtin__.pyi +++ b/stdlib/2/__builtin__.pyi @@ -625,22 +625,22 @@ class frozenset(AbstractSet[_T], Generic[_T]): def __init__(self) -> None: ... @overload def __init__(self, iterable: Iterable[_T]) -> None: ... - def copy(self) -> frozenset[_T]: ... - def difference(self, *s: Iterable[Any]) -> frozenset[_T]: ... - def intersection(self, *s: Iterable[Any]) -> frozenset[_T]: ... + def copy(self) -> FrozenSet[_T]: ... + def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ... + def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ... def isdisjoint(self, s: Iterable[_T]) -> bool: ... def issubset(self, s: Iterable[Any]) -> bool: ... def issuperset(self, s: Iterable[Any]) -> bool: ... - def symmetric_difference(self, s: Iterable[_T]) -> frozenset[_T]: ... - def union(self, *s: Iterable[_T]) -> frozenset[_T]: ... + def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ... + def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ... def __len__(self) -> int: ... def __contains__(self, o: object) -> bool: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... - def __and__(self, s: AbstractSet[_T]) -> frozenset[_T]: ... - def __or__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ... - def __sub__(self, s: AbstractSet[_T]) -> frozenset[_T]: ... - def __xor__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ... + def __and__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ... + def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ... + def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ... + def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ... def __le__(self, s: AbstractSet[Any]) -> bool: ... def __lt__(self, s: AbstractSet[Any]) -> bool: ... def __ge__(self, s: AbstractSet[Any]) -> bool: ... diff --git a/stdlib/2/typing.pyi b/stdlib/2/typing.pyi index f58940113c80..3c63ad614abb 100644 --- a/stdlib/2/typing.pyi +++ b/stdlib/2/typing.pyi @@ -31,6 +31,7 @@ List = TypeAlias(object) Dict = TypeAlias(object) DefaultDict = TypeAlias(object) Set = TypeAlias(object) +FrozenSet = TypeAlias(object) Counter = TypeAlias(object) Deque = TypeAlias(object) @@ -164,8 +165,6 @@ class AbstractSet(Sized, Iterable[_T_co], Container[_T_co], Generic[_T_co]): # TODO: argument can be any container? def isdisjoint(self, s: AbstractSet[Any]) -> bool: ... -class FrozenSet(AbstractSet[_T_co], Generic[_T_co]): ... - class MutableSet(AbstractSet[_T], Generic[_T]): @abstractmethod def add(self, x: _T) -> None: ... diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi index 5bf826c638d0..b434f1feda1b 100644 --- a/stdlib/3/builtins.pyi +++ b/stdlib/3/builtins.pyi @@ -672,22 +672,22 @@ class set(MutableSet[_T], Generic[_T]): class frozenset(AbstractSet[_T], Generic[_T]): def __init__(self, iterable: Iterable[_T] = ...) -> None: ... - def copy(self) -> frozenset[_T]: ... - def difference(self, *s: Iterable[Any]) -> frozenset[_T]: ... - def intersection(self, *s: Iterable[Any]) -> frozenset[_T]: ... + def copy(self) -> FrozenSet[_T]: ... + def difference(self, *s: Iterable[Any]) -> FrozenSet[_T]: ... + def intersection(self, *s: Iterable[Any]) -> FrozenSet[_T]: ... def isdisjoint(self, s: Iterable[_T]) -> bool: ... def issubset(self, s: Iterable[Any]) -> bool: ... def issuperset(self, s: Iterable[Any]) -> bool: ... - def symmetric_difference(self, s: Iterable[_T]) -> frozenset[_T]: ... - def union(self, *s: Iterable[_T]) -> frozenset[_T]: ... + def symmetric_difference(self, s: Iterable[_T]) -> FrozenSet[_T]: ... + def union(self, *s: Iterable[_T]) -> FrozenSet[_T]: ... def __len__(self) -> int: ... def __contains__(self, o: object) -> bool: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... - def __and__(self, s: AbstractSet[_T]) -> frozenset[_T]: ... - def __or__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ... - def __sub__(self, s: AbstractSet[_T]) -> frozenset[_T]: ... - def __xor__(self, s: AbstractSet[_S]) -> frozenset[Union[_T, _S]]: ... + def __and__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ... + def __or__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ... + def __sub__(self, s: AbstractSet[_T]) -> FrozenSet[_T]: ... + def __xor__(self, s: AbstractSet[_S]) -> FrozenSet[Union[_T, _S]]: ... def __le__(self, s: AbstractSet[Any]) -> bool: ... def __lt__(self, s: AbstractSet[Any]) -> bool: ... def __ge__(self, s: AbstractSet[Any]) -> bool: ... diff --git a/stdlib/3/typing.pyi b/stdlib/3/typing.pyi index a3ea9b68c3a3..05deb1c326e7 100644 --- a/stdlib/3/typing.pyi +++ b/stdlib/3/typing.pyi @@ -32,6 +32,7 @@ List = TypeAlias(object) Dict = TypeAlias(object) DefaultDict = TypeAlias(object) Set = TypeAlias(object) +FrozenSet = TypeAlias(object) Counter = TypeAlias(object) Deque = TypeAlias(object) if sys.version_info >= (3, 3): @@ -240,8 +241,6 @@ class AbstractSet(_Collection[_T_co], Generic[_T_co]): # TODO: Argument can be a more general ABC? def isdisjoint(self, s: AbstractSet[Any]) -> bool: ... -class FrozenSet(AbstractSet[_T_co], Generic[_T_co]): ... - class MutableSet(AbstractSet[_T], Generic[_T]): @abstractmethod def add(self, x: _T) -> None: ...