Remove Python 3.6 branches from typeshed (#8269)

stdlib/logging/__init__.pyi

@@ -708,12 +708,7 @@ else:
 
 fatal = critical
 
-if sys.version_info >= (3, 7):
-    def disable(level: int = ...) -> None: ...
-
-else:
-    def disable(level: int) -> None: ...
-
+def disable(level: int = ...) -> None: ...
 def addLevelName(level: int, levelName: str) -> None: ...
 def getLevelName(level: _Level) -> Any: ...
 
@@ -781,8 +776,7 @@ class StreamHandler(Handler, Generic[_StreamT]):
     def __init__(self: StreamHandler[TextIO], stream: None = ...) -> None: ...
     @overload
     def __init__(self: StreamHandler[_StreamT], stream: _StreamT) -> None: ...
-    if sys.version_info >= (3, 7):
-        def setStream(self, stream: _StreamT) -> _StreamT | None: ...
+    def setStream(self, stream: _StreamT) -> _StreamT | None: ...
     if sys.version_info >= (3, 11):
         def __class_getitem__(cls, item: Any) -> GenericAlias: ...
 

stdlib/logging/config.pyi

@@ -1,10 +1,9 @@
 import sys
-from _typeshed import StrOrBytesPath, StrPath
+from _typeshed import StrOrBytesPath
 from collections.abc import Callable, Sequence
 from configparser import RawConfigParser
 from threading import Thread
 from typing import IO, Any, Pattern
-from typing_extensions import TypeAlias
 
 from . import _Level
 
@@ -13,11 +12,6 @@ if sys.version_info >= (3, 8):
 else:
     from typing_extensions import Literal, TypedDict
 
-if sys.version_info >= (3, 7):
-    _Path: TypeAlias = StrOrBytesPath
-else:
-    _Path: TypeAlias = StrPath
-
 DEFAULT_LOGGING_CONFIG_PORT: int
 RESET_ERROR: int  # undocumented
 IDENTIFIER: Pattern[str]  # undocumented
@@ -53,7 +47,7 @@ def dictConfig(config: _DictConfigArgs | dict[str, Any]) -> None: ...
 
 if sys.version_info >= (3, 10):
     def fileConfig(
-        fname: _Path | IO[str] | RawConfigParser,
+        fname: StrOrBytesPath | IO[str] | RawConfigParser,
         defaults: dict[str, str] | None = ...,
         disable_existing_loggers: bool = ...,
         encoding: str | None = ...,
@@ -61,7 +55,9 @@ if sys.version_info >= (3, 10):
 
 else:
     def fileConfig(
-        fname: _Path | IO[str] | RawConfigParser, defaults: dict[str, str] | None = ..., disable_existing_loggers: bool = ...
+        fname: StrOrBytesPath | IO[str] | RawConfigParser,
+        defaults: dict[str, str] | None = ...,
+        disable_existing_loggers: bool = ...,
     ) -> None: ...
 
 def valid_ident(s: str) -> Literal[True]: ...  # undocumented

stdlib/logging/handlers.pyi

@@ -5,14 +5,10 @@ import sys
 from _typeshed import StrPath
 from collections.abc import Callable
 from logging import FileHandler, Handler, LogRecord
+from queue import Queue, SimpleQueue
 from socket import SocketKind, socket
 from typing import Any, ClassVar, Pattern
 
-if sys.version_info >= (3, 7):
-    from queue import Queue, SimpleQueue
-else:
-    from queue import Queue
-
 DEFAULT_TCP_LOGGING_PORT: int
 DEFAULT_UDP_LOGGING_PORT: int
 DEFAULT_HTTP_LOGGING_PORT: int
@@ -251,28 +247,16 @@ class HTTPHandler(Handler):
         def getConnection(self, host: str, secure: bool) -> http.client.HTTPConnection: ...  # undocumented
 
 class QueueHandler(Handler):
-    if sys.version_info >= (3, 7):
-        queue: SimpleQueue[Any] | Queue[Any]  # undocumented
-        def __init__(self, queue: SimpleQueue[Any] | Queue[Any]) -> None: ...
-    else:
-        queue: Queue[Any]  # undocumented
-        def __init__(self, queue: Queue[Any]) -> None: ...
-
+    queue: SimpleQueue[Any] | Queue[Any]  # undocumented
+    def __init__(self, queue: SimpleQueue[Any] | Queue[Any]) -> None: ...
     def prepare(self, record: LogRecord) -> Any: ...
     def enqueue(self, record: LogRecord) -> None: ...
 
 class QueueListener:
     handlers: tuple[Handler, ...]  # undocumented
     respect_handler_level: bool  # undocumented
-    if sys.version_info >= (3, 7):
-        queue: SimpleQueue[Any] | Queue[Any]  # undocumented
-        def __init__(
-            self, queue: SimpleQueue[Any] | Queue[Any], *handlers: Handler, respect_handler_level: bool = ...
-        ) -> None: ...
-    else:
-        queue: Queue[Any]  # undocumented
-        def __init__(self, queue: Queue[Any], *handlers: Handler, respect_handler_level: bool = ...) -> None: ...
-
+    queue: SimpleQueue[Any] | Queue[Any]  # undocumented
+    def __init__(self, queue: SimpleQueue[Any] | Queue[Any], *handlers: Handler, respect_handler_level: bool = ...) -> None: ...
     def dequeue(self, block: bool) -> LogRecord: ...
     def prepare(self, record: LogRecord) -> Any: ...
     def start(self) -> None: ...