--- ../contextlib.pyi 2021-06-29 19:05:46.515307191 +0100 +++ contextlib2/__init__.pyi 2021-06-29 19:15:26.814620184 +0100 @@ -1,3 +1,6 @@ +# Type hints copied from the typeshed project under the Apache License 2.0 +# https://github.com/python/typeshed/blob/64c85cdd449ccaff90b546676220c9ecfa6e697f/LICENSE + import sys from types import TracebackType from typing import ( @@ -16,8 +19,14 @@ ) from typing_extensions import ParamSpec, Protocol +# contextlib2 API adaptation notes: +# * the various 'if True:' guards replace sys.version checks in the original +# typeshed file (those APIs are available on all supported versions) +# * deliberately omitted APIs are listed in `dev/mypy.allowlist` +# (e.g. deprecated experimental APIs that never graduated to the stdlib) + AbstractContextManager = ContextManager -if sys.version_info >= (3, 7): +if True: AbstractAsyncContextManager = AsyncContextManager _T = TypeVar("_T") @@ -35,7 +44,7 @@ # type ignore to deal with incomplete ParamSpec support in mypy def contextmanager(func: Callable[_P, Iterator[_T]]) -> Callable[_P, _GeneratorContextManager[_T]]: ... # type: ignore -if sys.version_info >= (3, 7): +if True: def asynccontextmanager(func: Callable[_P, AsyncIterator[_T]]) -> Callable[_P, AsyncContextManager[_T]]: ... # type: ignore class _SupportsClose(Protocol): @@ -46,7 +55,7 @@ class closing(ContextManager[_SupportsCloseT]): def __init__(self, thing: _SupportsCloseT) -> None: ... -if sys.version_info >= (3, 10): +if True: class _SupportsAclose(Protocol): def aclose(self) -> Awaitable[object]: ... _SupportsAcloseT = TypeVar("_SupportsAcloseT", bound=_SupportsAclose) @@ -88,7 +97,7 @@ __traceback: Optional[TracebackType], ) -> bool: ... -if sys.version_info >= (3, 7): +if True: _S = TypeVar("_S", bound=AsyncExitStack) _ExitCoroFunc = Callable[[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]], Awaitable[bool]] @@ -112,7 +121,8 @@ __traceback: Optional[TracebackType], ) -> Awaitable[bool]: ... -if sys.version_info >= (3, 10): + +if True: class nullcontext(AbstractContextManager[_T], AbstractAsyncContextManager[_T]): enter_result: _T @overload @@ -123,13 +133,3 @@ def __exit__(self, *exctype: Any) -> None: ... async def __aenter__(self) -> _T: ... async def __aexit__(self, *exctype: Any) -> None: ... - -elif sys.version_info >= (3, 7): - class nullcontext(AbstractContextManager[_T]): - enter_result: _T - @overload - def __init__(self: nullcontext[None], enter_result: None = ...) -> None: ... - @overload - def __init__(self: nullcontext[_T], enter_result: _T) -> None: ... - def __enter__(self) -> _T: ... - def __exit__(self, *exctype: Any) -> None: ...