Skip to content

stdlib: Add a _FilterProtocol type to logging's Filterer.addFilter() filter argument. #11018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Akuli merged 4 commits into from
Nov 14, 2023
Merged

stdlib: Add a _FilterProtocol type to logging's Filterer.addFilter() filter argument. #11018

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3525fcb
stdlib: Add a _FilterProtocol type to logging's Filterer.addFilter() …
jenstroeger Nov 11, 2023
55e3710
Remove unnecessary Filter type from filter() arg type and adjust for …
jenstroeger Nov 12, 2023
eed6015
Refactor to support Py 3.12+ for all logging filters.
jenstroeger Nov 12, 2023
fe68d1a
Keep arg name flexible.
jenstroeger Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions stdlib/logging/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ from re import Pattern
from string import Template
from time import struct_time
from types import FrameType, TracebackType
from typing import Any, ClassVar, Generic, TextIO, TypeVar, overload
from typing import Any, ClassVar, Generic, Protocol, TextIO, TypeVar, overload
from typing_extensions import Literal, Self, TypeAlias

if sys.version_info >= (3, 11):
Expand Down Expand Up @@ -66,10 +66,20 @@ if sys.version_info >= (3, 12):
_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 = Filter | 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
Expand Down