Remove Python 3.6 branches from typeshed (#8269)

stdlib/contextlib.pyi

@@ -2,7 +2,7 @@ import sys
 from _typeshed import Self, StrOrBytesPath
 from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Generator, Iterator
 from types import TracebackType
-from typing import IO, Any, ContextManager, Generic, Protocol, TypeVar, overload  # noqa: Y027
+from typing import IO, Any, AsyncContextManager, ContextManager, Generic, Protocol, TypeVar, overload  # noqa: Y022,Y027
 from typing_extensions import ParamSpec, TypeAlias
 
 __all__ = [
@@ -14,23 +14,18 @@ __all__ = [
     "redirect_stdout",
     "redirect_stderr",
     "suppress",
+    "AbstractAsyncContextManager",
+    "AsyncExitStack",
+    "asynccontextmanager",
+    "nullcontext",
 ]
 
-if sys.version_info >= (3, 7):
-    __all__ += ["AbstractAsyncContextManager", "AsyncExitStack", "asynccontextmanager", "nullcontext"]
-
 if sys.version_info >= (3, 10):
     __all__ += ["aclosing"]
 
 if sys.version_info >= (3, 11):
     __all__ += ["chdir"]
 
-AbstractContextManager = ContextManager
-if sys.version_info >= (3, 7):
-    from typing import AsyncContextManager  # noqa: Y022
-
-    AbstractAsyncContextManager = AsyncContextManager
-
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
 _T_io = TypeVar("_T_io", bound=IO[str] | None)
@@ -40,12 +35,14 @@ _P = ParamSpec("_P")
 _ExitFunc: TypeAlias = Callable[[type[BaseException] | None, BaseException | None, TracebackType | None], bool | None]
 _CM_EF = TypeVar("_CM_EF", bound=AbstractContextManager[Any] | _ExitFunc)
 
+AbstractContextManager = ContextManager
+AbstractAsyncContextManager = AsyncContextManager
+
 class ContextDecorator:
     def __call__(self, func: _F) -> _F: ...
 
 class _GeneratorContextManager(AbstractContextManager[_T_co], ContextDecorator, Generic[_T_co]):
-    # In Python <= 3.6, __init__ and all instance attributes are defined directly on this class.
-    # In Python >= 3.7, __init__ and all instance attributes are inherited from _GeneratorContextManagerBase
+    # __init__ and all instance attributes are actually inherited from _GeneratorContextManagerBase
     # _GeneratorContextManagerBase is more trouble than it's worth to include in the stub; see #6676
     def __init__(self, func: Callable[..., Iterator[_T_co]], args: tuple[Any, ...], kwds: dict[str, Any]) -> None: ...
     gen: Generator[_T_co, Any, Any]
@@ -76,7 +73,7 @@ if sys.version_info >= (3, 10):
             self, typ: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
         ) -> bool | None: ...
 
-elif sys.version_info >= (3, 7):
+else:
     class _AsyncGeneratorContextManager(AbstractAsyncContextManager[_T_co], Generic[_T_co]):
         def __init__(self, func: Callable[..., AsyncIterator[_T_co]], args: tuple[Any, ...], kwds: dict[str, Any]) -> None: ...
         gen: AsyncGenerator[_T_co, Any]
@@ -87,8 +84,7 @@ elif sys.version_info >= (3, 7):
             self, typ: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None
         ) -> bool | None: ...
 
-if sys.version_info >= (3, 7):
-    def asynccontextmanager(func: Callable[_P, AsyncIterator[_T_co]]) -> Callable[_P, _AsyncGeneratorContextManager[_T_co]]: ...
+def asynccontextmanager(func: Callable[_P, AsyncIterator[_T_co]]) -> Callable[_P, _AsyncGeneratorContextManager[_T_co]]: ...
 
 class _SupportsClose(Protocol):
     def close(self) -> object: ...
@@ -135,26 +131,25 @@ class ExitStack:
         self, __exc_type: type[BaseException] | None, __exc_value: BaseException | None, __traceback: TracebackType | None
     ) -> bool: ...
 
-if sys.version_info >= (3, 7):
-    _ExitCoroFunc: TypeAlias = Callable[[type[BaseException] | None, BaseException | None, TracebackType | None], Awaitable[bool]]
-    _ACM_EF = TypeVar("_ACM_EF", bound=AbstractAsyncContextManager[Any] | _ExitCoroFunc)
+_ExitCoroFunc: TypeAlias = Callable[[type[BaseException] | None, BaseException | None, TracebackType | None], Awaitable[bool]]
+_ACM_EF = TypeVar("_ACM_EF", bound=AbstractAsyncContextManager[Any] | _ExitCoroFunc)
 
-    class AsyncExitStack:
-        def __init__(self) -> None: ...
-        def enter_context(self, cm: AbstractContextManager[_T]) -> _T: ...
-        async def enter_async_context(self, cm: AbstractAsyncContextManager[_T]) -> _T: ...
-        def push(self, exit: _CM_EF) -> _CM_EF: ...
-        def push_async_exit(self, exit: _ACM_EF) -> _ACM_EF: ...
-        def callback(self, __callback: Callable[_P, _T], *args: _P.args, **kwds: _P.kwargs) -> Callable[_P, _T]: ...
-        def push_async_callback(
-            self, __callback: Callable[_P, Awaitable[_T]], *args: _P.args, **kwds: _P.kwargs
-        ) -> Callable[_P, Awaitable[_T]]: ...
-        def pop_all(self: Self) -> Self: ...
-        async def aclose(self) -> None: ...
-        async def __aenter__(self: Self) -> Self: ...
-        async def __aexit__(
-            self, __exc_type: type[BaseException] | None, __exc_value: BaseException | None, __traceback: TracebackType | None
-        ) -> bool: ...
+class AsyncExitStack:
+    def __init__(self) -> None: ...
+    def enter_context(self, cm: AbstractContextManager[_T]) -> _T: ...
+    async def enter_async_context(self, cm: AbstractAsyncContextManager[_T]) -> _T: ...
+    def push(self, exit: _CM_EF) -> _CM_EF: ...
+    def push_async_exit(self, exit: _ACM_EF) -> _ACM_EF: ...
+    def callback(self, __callback: Callable[_P, _T], *args: _P.args, **kwds: _P.kwargs) -> Callable[_P, _T]: ...
+    def push_async_callback(
+        self, __callback: Callable[_P, Awaitable[_T]], *args: _P.args, **kwds: _P.kwargs
+    ) -> Callable[_P, Awaitable[_T]]: ...
+    def pop_all(self: Self) -> Self: ...
+    async def aclose(self) -> None: ...
+    async def __aenter__(self: Self) -> Self: ...
+    async def __aexit__(
+        self, __exc_type: type[BaseException] | None, __exc_value: BaseException | None, __traceback: TracebackType | None
+    ) -> bool: ...
 
 if sys.version_info >= (3, 10):
     class nullcontext(AbstractContextManager[_T], AbstractAsyncContextManager[_T]):
@@ -168,7 +163,7 @@ if sys.version_info >= (3, 10):
         async def __aenter__(self) -> _T: ...
         async def __aexit__(self, *exctype: object) -> None: ...
 
-elif sys.version_info >= (3, 7):
+else:
     class nullcontext(AbstractContextManager[_T]):
         enter_result: _T
         @overload