Skip to content

Commit 2756f16

Browse files
authored
logging: update for py313 (#11972)
1 parent 70d2c4e commit 2756f16

File tree

1 file changed

+64
-38
lines changed

1 file changed

+64
-38
lines changed

stdlib/logging/__init__.pyi

Lines changed: 64 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,17 @@ class Logger(Filterer):
156156
stacklevel: int = 1,
157157
extra: Mapping[str, object] | None = None,
158158
) -> None: ...
159-
def warn(
160-
self,
161-
msg: object,
162-
*args: object,
163-
exc_info: _ExcInfoType = None,
164-
stack_info: bool = False,
165-
stacklevel: int = 1,
166-
extra: Mapping[str, object] | None = None,
167-
) -> None: ...
159+
if sys.version_info < (3, 13):
160+
def warn(
161+
self,
162+
msg: object,
163+
*args: object,
164+
exc_info: _ExcInfoType = None,
165+
stack_info: bool = False,
166+
stacklevel: int = 1,
167+
extra: Mapping[str, object] | None = None,
168+
) -> None: ...
169+
168170
def error(
169171
self,
170172
msg: object,
@@ -365,12 +367,18 @@ _L = TypeVar("_L", bound=Logger | LoggerAdapter[Any])
365367
class LoggerAdapter(Generic[_L]):
366368
logger: _L
367369
manager: Manager # undocumented
370+
371+
if sys.version_info >= (3, 13):
372+
def __init__(self, logger: _L, extra: Mapping[str, object] | None = None, merge_extra: bool = False) -> None: ...
373+
elif sys.version_info >= (3, 10):
374+
def __init__(self, logger: _L, extra: Mapping[str, object] | None = None) -> None: ...
375+
else:
376+
def __init__(self, logger: _L, extra: Mapping[str, object]) -> None: ...
377+
368378
if sys.version_info >= (3, 10):
369379
extra: Mapping[str, object] | None
370-
def __init__(self, logger: _L, extra: Mapping[str, object] | None = None) -> None: ...
371380
else:
372381
extra: Mapping[str, object]
373-
def __init__(self, logger: _L, extra: Mapping[str, object]) -> None: ...
374382

375383
def process(self, msg: Any, kwargs: MutableMapping[str, Any]) -> tuple[Any, MutableMapping[str, Any]]: ...
376384
def debug(
@@ -403,16 +411,18 @@ class LoggerAdapter(Generic[_L]):
403411
extra: Mapping[str, object] | None = None,
404412
**kwargs: object,
405413
) -> None: ...
406-
def warn(
407-
self,
408-
msg: object,
409-
*args: object,
410-
exc_info: _ExcInfoType = None,
411-
stack_info: bool = False,
412-
stacklevel: int = 1,
413-
extra: Mapping[str, object] | None = None,
414-
**kwargs: object,
415-
) -> None: ...
414+
if sys.version_info < (3, 13):
415+
def warn(
416+
self,
417+
msg: object,
418+
*args: object,
419+
exc_info: _ExcInfoType = None,
420+
stack_info: bool = False,
421+
stacklevel: int = 1,
422+
extra: Mapping[str, object] | None = None,
423+
**kwargs: object,
424+
) -> None: ...
425+
416426
def error(
417427
self,
418428
msg: object,
@@ -458,15 +468,28 @@ class LoggerAdapter(Generic[_L]):
458468
def getEffectiveLevel(self) -> int: ...
459469
def setLevel(self, level: _Level) -> None: ...
460470
def hasHandlers(self) -> bool: ...
461-
def _log(
462-
self,
463-
level: int,
464-
msg: object,
465-
args: _ArgsType,
466-
exc_info: _ExcInfoType | None = None,
467-
extra: Mapping[str, object] | None = None,
468-
stack_info: bool = False,
469-
) -> None: ... # undocumented
471+
if sys.version_info >= (3, 13):
472+
def _log(
473+
self,
474+
level: int,
475+
msg: object,
476+
args: _ArgsType,
477+
*,
478+
exc_info: _ExcInfoType | None = None,
479+
extra: Mapping[str, object] | None = None,
480+
stack_info: bool = False,
481+
) -> None: ... # undocumented
482+
else:
483+
def _log(
484+
self,
485+
level: int,
486+
msg: object,
487+
args: _ArgsType,
488+
exc_info: _ExcInfoType | None = None,
489+
extra: Mapping[str, object] | None = None,
490+
stack_info: bool = False,
491+
) -> None: ... # undocumented
492+
470493
@property
471494
def name(self) -> str: ... # undocumented
472495
if sys.version_info >= (3, 11):
@@ -499,14 +522,17 @@ def warning(
499522
stacklevel: int = 1,
500523
extra: Mapping[str, object] | None = None,
501524
) -> None: ...
502-
def warn(
503-
msg: object,
504-
*args: object,
505-
exc_info: _ExcInfoType = None,
506-
stack_info: bool = False,
507-
stacklevel: int = 1,
508-
extra: Mapping[str, object] | None = None,
509-
) -> None: ...
525+
526+
if sys.version_info < (3, 13):
527+
def warn(
528+
msg: object,
529+
*args: object,
530+
exc_info: _ExcInfoType = None,
531+
stack_info: bool = False,
532+
stacklevel: int = 1,
533+
extra: Mapping[str, object] | None = None,
534+
) -> None: ...
535+
510536
def error(
511537
msg: object,
512538
*args: object,

0 commit comments

Comments
 (0)