Refactor to support Py 3.12+ for all logging filters.

jenstroeger · jenstroeger · commit eed6015703ce · 2023-11-13T09:11:52.000+10:00
diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi
@@ -63,19 +63,23 @@ if sys.version_info >= (3, 11):
 if sys.version_info >= (3, 12):
     __all__ += ["getHandlerByName", "getHandlerNames"]
 
-class _SupportsFilter(Protocol):
-    if sys.version_info >= (3, 12):
-        def filter(self, record: LogRecord) -> bool | LogRecord: ...
-    else:
-        def filter(self, record: LogRecord) -> bool: ...
-
 _SysExcInfoType: TypeAlias = tuple[type[BaseException], BaseException, TracebackType | None] | tuple[None, None, None]
 _ExcInfoType: TypeAlias = None | bool | _SysExcInfoType | BaseException
 _ArgsType: TypeAlias = tuple[object, ...] | Mapping[str, object]
-_FilterType: TypeAlias = _SupportsFilter | Callable[[LogRecord], bool]
 _Level: TypeAlias = int | str
 _FormatStyle: TypeAlias = Literal["%", "{", "$"]
 
+if sys.version_info >= (3, 12):
+    class _SupportsFilter(Protocol):
+        def filter(self, record: LogRecord) -> bool | LogRecord: ...
+
+    _FilterType: TypeAlias = Filter | Callable[[LogRecord], bool | LogRecord] | _SupportsFilter
+else:
+    class _SupportsFilter(Protocol):
+        def filter(self, record: LogRecord) -> bool: ...
+
+    _FilterType: TypeAlias = Filter | Callable[[LogRecord], bool] | _SupportsFilter
+
 raiseExceptions: bool
 logThreads: bool
 logMultiprocessing: bool
