Prepare release 2.0.4 (#53)

README.rst

@@ -81,6 +81,10 @@ call ``resolver.get_fully_qualified_name('collections.Set')`` to retrieve the
 Changelog
 ---------
 
+Version 2.0.4 (March 10, 2022)
+
+- Update bundled typeshed
+
 Version 2.0.3 (February 2, 2022)
 
 - Update bundled typeshed

typeshed_client/__init__.py

@@ -23,4 +23,4 @@
 from .resolver import ImportedInfo, Resolver
 
 
-__version__ = "2.0.3"
+__version__ = "2.0.4"

typeshed_client/typeshed/@python2/UserString.pyi

@@ -1,7 +1,5 @@
 from _typeshed import Self
-from typing import Any, Iterable, MutableSequence, Sequence, Text, TypeVar, overload
-
-_MST = TypeVar("_MST", bound=MutableString)
+from typing import Any, Iterable, MutableSequence, Sequence, Text, overload
 
 class UserString(Sequence[UserString]):
     data: unicode
@@ -70,5 +68,5 @@ class MutableString(UserString, MutableSequence[MutableString]):
     def __delitem__(self, index: int | slice) -> None: ...
     def immutable(self) -> UserString: ...
     def __iadd__(self: Self, other: Any) -> Self: ...
-    def __imul__(self, n: int) -> _MST: ...
+    def __imul__(self: Self, n: int) -> Self: ...
     def insert(self, index: int, value: Any) -> None: ...

typeshed_client/typeshed/@python2/__builtin__.pyi

@@ -708,9 +708,9 @@ class set(MutableSet[_T], Generic[_T]):
     def __contains__(self, o: object) -> bool: ...
     def __iter__(self) -> Iterator[_T]: ...
     def __and__(self, s: AbstractSet[object]) -> set[_T]: ...
-    def __iand__(self, s: AbstractSet[object]) -> set[_T]: ...
+    def __iand__(self: Self, s: AbstractSet[object]) -> Self: ...
     def __or__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ior__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ior__(self: Self, s: AbstractSet[_T]) -> Self: ...
     @overload
     def __sub__(self: set[str], s: AbstractSet[Text | None]) -> set[_T]: ...
     @overload
@@ -720,7 +720,7 @@ class set(MutableSet[_T], Generic[_T]):
     @overload
     def __isub__(self, s: AbstractSet[_T | None]) -> set[_T]: ...
     def __xor__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ixor__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ixor__(self: Self, s: AbstractSet[_T]) -> Self: ...
     def __le__(self, s: AbstractSet[object]) -> bool: ...
     def __lt__(self, s: AbstractSet[object]) -> bool: ...
     def __ge__(self, s: AbstractSet[object]) -> bool: ...
@@ -751,7 +751,7 @@ class frozenset(AbstractSet[_T_co], Generic[_T_co]):
 
 class enumerate(Iterator[tuple[int, _T]], Generic[_T]):
     def __init__(self, iterable: Iterable[_T], start: int = ...) -> None: ...
-    def __iter__(self) -> Iterator[tuple[int, _T]]: ...
+    def __iter__(self: Self) -> Self: ...
     def next(self) -> tuple[int, _T]: ...
 
 class xrange(Sized, Iterable[int], Reversible[int]):

typeshed_client/typeshed/@python2/_collections.pyi

@@ -4,7 +4,6 @@ from typing import Any, Callable, Generic, Iterator, TypeVar
 _K = TypeVar("_K")
 _V = TypeVar("_V")
 _T = TypeVar("_T")
-_T2 = TypeVar("_T2")
 
 class defaultdict(dict[_K, _V]):
     default_factory: None
@@ -30,7 +29,7 @@ class deque(Generic[_T]):
     def __contains__(self, o: Any) -> bool: ...
     def __copy__(self) -> deque[_T]: ...
     def __getitem__(self, i: int) -> _T: ...
-    def __iadd__(self, other: deque[_T2]) -> deque[_T | _T2]: ...
+    def __iadd__(self: Self, other: deque[_T]) -> Self: ...
     def __iter__(self) -> Iterator[_T]: ...
     def __len__(self) -> int: ...
     def __reversed__(self) -> Iterator[_T]: ...

typeshed_client/typeshed/@python2/_dummy_threading.pyi

@@ -6,7 +6,25 @@ _TF = Callable[[FrameType, str, Any], Optional[Callable[..., Any]]]
 
 _PF = Callable[[FrameType, str, Any], None]
 
-__all__: list[str]
+__all__ = [
+    "activeCount",
+    "active_count",
+    "Condition",
+    "currentThread",
+    "current_thread",
+    "enumerate",
+    "Event",
+    "Lock",
+    "RLock",
+    "Semaphore",
+    "BoundedSemaphore",
+    "Thread",
+    "Timer",
+    "setprofile",
+    "settrace",
+    "local",
+    "stack_size",
+]
 
 def active_count() -> int: ...
 def activeCount() -> int: ...

typeshed_client/typeshed/@python2/_osx_support.pyi

@@ -4,7 +4,7 @@ _T = TypeVar("_T")
 _K = TypeVar("_K")
 _V = TypeVar("_V")
 
-__all__: list[str]
+__all__ = ["compiler_fixup", "customize_config_vars", "customize_compiler", "get_platform_osx"]
 
 _UNIVERSAL_CONFIG_VARS: tuple[str, ...]  # undocumented
 _COMPILER_CONFIG_VARS: tuple[str, ...]  # undocumented

typeshed_client/typeshed/@python2/_weakrefset.pyi

@@ -16,15 +16,15 @@ class WeakSet(MutableSet[_T], Generic[_T]):
     def __contains__(self, item: object) -> bool: ...
     def __len__(self) -> int: ...
     def __iter__(self) -> Iterator[_T]: ...
-    def __ior__(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
+    def __ior__(self: Self, other: Iterable[_T]) -> Self: ...  # type: ignore[override,misc]
     def difference(self: Self, other: Iterable[_T]) -> Self: ...
-    def __sub__(self: Self, other: Iterable[_T]) -> Self: ...
-    def difference_update(self, other: Iterable[_T]) -> None: ...
-    def __isub__(self: Self, other: Iterable[_T]) -> Self: ...
+    def __sub__(self: Self, other: Iterable[Any]) -> Self: ...
+    def difference_update(self, other: Iterable[Any]) -> None: ...
+    def __isub__(self: Self, other: Iterable[Any]) -> Self: ...
     def intersection(self: Self, other: Iterable[_T]) -> Self: ...
-    def __and__(self: Self, other: Iterable[_T]) -> Self: ...
-    def intersection_update(self, other: Iterable[_T]) -> None: ...
-    def __iand__(self: Self, other: Iterable[_T]) -> Self: ...
+    def __and__(self: Self, other: Iterable[Any]) -> Self: ...
+    def intersection_update(self, other: Iterable[Any]) -> None: ...
+    def __iand__(self: Self, other: Iterable[Any]) -> Self: ...
     def issubset(self, other: Iterable[_T]) -> bool: ...
     def __le__(self, other: Iterable[_T]) -> bool: ...
     def __lt__(self, other: Iterable[_T]) -> bool: ...
@@ -34,8 +34,8 @@ class WeakSet(MutableSet[_T], Generic[_T]):
     def __eq__(self, other: object) -> bool: ...
     def symmetric_difference(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
     def __xor__(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
-    def symmetric_difference_update(self, other: Iterable[Any]) -> None: ...
-    def __ixor__(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
+    def symmetric_difference_update(self, other: Iterable[_T]) -> None: ...
+    def __ixor__(self: Self, other: Iterable[_T]) -> Self: ...  # type: ignore[override,misc]
     def union(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
     def __or__(self, other: Iterable[_S]) -> WeakSet[_S | _T]: ...
     def isdisjoint(self, other: Iterable[_T]) -> bool: ...

typeshed_client/typeshed/@python2/_winreg.pyi

@@ -1,4 +1,5 @@
 import sys
+from _typeshed import Self
 from types import TracebackType
 from typing import Any, Union
 
@@ -88,7 +89,7 @@ if sys.platform == "win32":
     class HKEYType:
         def __bool__(self) -> bool: ...
         def __int__(self) -> int: ...
-        def __enter__(self) -> HKEYType: ...
+        def __enter__(self: Self) -> Self: ...
         def __exit__(
             self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
         ) -> bool | None: ...

typeshed_client/typeshed/@python2/array.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from typing import Any, BinaryIO, Generic, Iterable, MutableSequence, Text, TypeVar, Union, overload
 from typing_extensions import Literal
 
@@ -52,8 +53,8 @@ class array(MutableSequence[_T], Generic[_T]):
     def __add__(self, x: array[_T]) -> array[_T]: ...
     def __ge__(self, other: array[_T]) -> bool: ...
     def __gt__(self, other: array[_T]) -> bool: ...
-    def __iadd__(self, x: array[_T]) -> array[_T]: ...  # type: ignore  # Overrides MutableSequence
-    def __imul__(self, n: int) -> array[_T]: ...
+    def __iadd__(self: Self, x: array[_T]) -> Self: ...  # type: ignore[override]
+    def __imul__(self: Self, n: int) -> Self: ...
     def __le__(self, other: array[_T]) -> bool: ...
     def __lt__(self, other: array[_T]) -> bool: ...
     def __mul__(self, n: int) -> array[_T]: ...

typeshed_client/typeshed/@python2/builtins.pyi

@@ -708,9 +708,9 @@ class set(MutableSet[_T], Generic[_T]):
     def __contains__(self, o: object) -> bool: ...
     def __iter__(self) -> Iterator[_T]: ...
     def __and__(self, s: AbstractSet[object]) -> set[_T]: ...
-    def __iand__(self, s: AbstractSet[object]) -> set[_T]: ...
+    def __iand__(self: Self, s: AbstractSet[object]) -> Self: ...
     def __or__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ior__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ior__(self: Self, s: AbstractSet[_T]) -> Self: ...
     @overload
     def __sub__(self: set[str], s: AbstractSet[Text | None]) -> set[_T]: ...
     @overload
@@ -720,7 +720,7 @@ class set(MutableSet[_T], Generic[_T]):
     @overload
     def __isub__(self, s: AbstractSet[_T | None]) -> set[_T]: ...
     def __xor__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
-    def __ixor__(self, s: AbstractSet[_S]) -> set[_T | _S]: ...
+    def __ixor__(self: Self, s: AbstractSet[_T]) -> Self: ...
     def __le__(self, s: AbstractSet[object]) -> bool: ...
     def __lt__(self, s: AbstractSet[object]) -> bool: ...
     def __ge__(self, s: AbstractSet[object]) -> bool: ...
@@ -751,7 +751,7 @@ class frozenset(AbstractSet[_T_co], Generic[_T_co]):
 
 class enumerate(Iterator[tuple[int, _T]], Generic[_T]):
     def __init__(self, iterable: Iterable[_T], start: int = ...) -> None: ...
-    def __iter__(self) -> Iterator[tuple[int, _T]]: ...
+    def __iter__(self: Self) -> Self: ...
     def next(self) -> tuple[int, _T]: ...
 
 class xrange(Sized, Iterable[int], Reversible[int]):

typeshed_client/typeshed/@python2/codecs.pyi

@@ -85,7 +85,7 @@ class CodecInfo(tuple[_Encoder, _Decoder, _StreamReader, _StreamWriter]):
     def incrementaldecoder(self) -> _IncrementalDecoder: ...
     name: str
     def __new__(
-        cls,
+        cls: type[Self],
         encode: _Encoder,
         decode: _Decoder,
         streamreader: _StreamReader | None = ...,
@@ -95,7 +95,7 @@ class CodecInfo(tuple[_Encoder, _Decoder, _StreamReader, _StreamWriter]):
         name: str | None = ...,
         *,
         _is_text_encoding: bool | None = ...,
-    ) -> CodecInfo: ...
+    ) -> Self: ...
 
 def getencoder(encoding: str) -> _Encoder: ...
 def getdecoder(encoding: str) -> _Decoder: ...

typeshed_client/typeshed/@python2/collections.pyi

@@ -87,10 +87,10 @@ class Counter(dict[_T, int], Generic[_T]):
     def __sub__(self, other: Counter[_T]) -> Counter[_T]: ...
     def __and__(self, other: Counter[_T]) -> Counter[_T]: ...
     def __or__(self, other: Counter[_T]) -> Counter[_T]: ...
-    def __iadd__(self, other: Counter[_T]) -> Counter[_T]: ...
-    def __isub__(self, other: Counter[_T]) -> Counter[_T]: ...
-    def __iand__(self, other: Counter[_T]) -> Counter[_T]: ...
-    def __ior__(self, other: Counter[_T]) -> Counter[_T]: ...
+    def __iadd__(self: Self, other: Counter[_T]) -> Self: ...
+    def __isub__(self: Self, other: Counter[_T]) -> Self: ...
+    def __iand__(self: Self, other: Counter[_T]) -> Self: ...
+    def __ior__(self: Self, other: Counter[_T]) -> Self: ...
 
 class OrderedDict(dict[_KT, _VT], Reversible[_KT], Generic[_KT, _VT]):
     def popitem(self, last: bool = ...) -> tuple[_KT, _VT]: ...

typeshed_client/typeshed/@python2/copy_reg.pyi

@@ -3,7 +3,7 @@ from typing import Any, Callable, Hashable, Optional, SupportsInt, TypeVar, Unio
 _TypeT = TypeVar("_TypeT", bound=type)
 _Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Optional[Any]]]
 
-__all__: list[str]
+__all__ = ["pickle", "constructor", "add_extension", "remove_extension", "clear_extension_cache"]
 
 def pickle(
     ob_type: _TypeT,

typeshed_client/typeshed/@python2/copyreg.pyi

@@ -3,7 +3,7 @@ from typing import Any, Callable, Hashable, Optional, SupportsInt, TypeVar, Unio
 _TypeT = TypeVar("_TypeT", bound=type)
 _Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Optional[Any]]]
 
-__all__: list[str]
+__all__ = ["pickle", "constructor", "add_extension", "remove_extension", "clear_extension_cache"]
 
 def pickle(
     ob_type: _TypeT,

typeshed_client/typeshed/@python2/dbm/__init__.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from types import TracebackType
 from typing import Iterator, MutableMapping, Union
 from typing_extensions import Literal
@@ -13,7 +14,7 @@ class _Database(MutableMapping[_KeyType, bytes]):
     def __iter__(self) -> Iterator[bytes]: ...
     def __len__(self) -> int: ...
     def __del__(self) -> None: ...
-    def __enter__(self) -> _Database: ...
+    def __enter__(self: Self) -> Self: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...

typeshed_client/typeshed/@python2/dbm/dumb.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from types import TracebackType
 from typing import Iterator, MutableMapping, Union
 
@@ -17,7 +18,7 @@ class _Database(MutableMapping[_KeyType, bytes]):
     def __iter__(self) -> Iterator[bytes]: ...
     def __len__(self) -> int: ...
     def __del__(self) -> None: ...
-    def __enter__(self) -> _Database: ...
+    def __enter__(self: Self) -> Self: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...

typeshed_client/typeshed/@python2/dbm/gnu.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from types import TracebackType
 from typing import TypeVar, Union, overload
 
@@ -18,7 +19,7 @@ class _gdbm:
     def __setitem__(self, key: _KeyType, value: _ValueType) -> None: ...
     def __delitem__(self, key: _KeyType) -> None: ...
     def __len__(self) -> int: ...
-    def __enter__(self) -> _gdbm: ...
+    def __enter__(self: Self) -> Self: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...

typeshed_client/typeshed/@python2/dbm/ndbm.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from types import TracebackType
 from typing import TypeVar, Union, overload
 
@@ -17,7 +18,7 @@ class _dbm:
     def __delitem__(self, key: _KeyType) -> None: ...
     def __len__(self) -> int: ...
     def __del__(self) -> None: ...
-    def __enter__(self) -> _dbm: ...
+    def __enter__(self: Self) -> Self: ...
     def __exit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...

typeshed_client/typeshed/@python2/itertools.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from typing import Any, Callable, Generic, Iterable, Iterator, Sequence, TypeVar, overload
 
 _T = TypeVar("_T")
@@ -8,14 +9,14 @@ def count(start: int = ..., step: int = ...) -> Iterator[int]: ...  # more gener
 class cycle(Iterator[_T], Generic[_T]):
     def __init__(self, iterable: Iterable[_T]) -> None: ...
     def next(self) -> _T: ...
-    def __iter__(self) -> Iterator[_T]: ...
+    def __iter__(self: Self) -> Self: ...
 
 def repeat(object: _T, times: int = ...) -> Iterator[_T]: ...
 
 class chain(Iterator[_T], Generic[_T]):
     def __init__(self, *iterables: Iterable[_T]) -> None: ...
     def next(self) -> _T: ...
-    def __iter__(self) -> Iterator[_T]: ...
+    def __iter__(self: Self) -> Self: ...
     @staticmethod
     def from_iterable(iterable: Iterable[Iterable[_S]]) -> Iterator[_S]: ...
 

typeshed_client/typeshed/@python2/multiprocessing/pool.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from typing import Any, Callable, Iterable, Iterator
 
 class AsyncResult:
@@ -7,7 +8,7 @@ class AsyncResult:
     def successful(self) -> bool: ...
 
 class IMapIterator(Iterator[Any]):
-    def __iter__(self) -> Iterator[Any]: ...
+    def __iter__(self: Self) -> Self: ...
     def next(self, timeout: float | None = ...) -> Any: ...
 
 class IMapUnorderedIterator(IMapIterator): ...