mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-21 19:32:13 +08:00
add Optional to exc_info and extra in logging (#1117)
None is the default value for these two arguments to logging.Logger._log (which most other stuff in logging delegates to). I was getting errors in my codebase because mypy now distinguishes between Any and Optional[Any].
This commit is contained in:
Jelle Zijlstra
committed by
Guido van Rossum
Guido van Rossum
parent
6a06dd40e1
commit
84371e812c
@@ -13,9 +13,9 @@ import threading
|
||||
_SysExcInfoType = Union[Tuple[type, BaseException, TracebackType],
|
||||
Tuple[None, None, None]]
|
||||
if sys.version_info >= (3, 5):
|
||||
_ExcInfoType = Union[bool, _SysExcInfoType, Exception]
|
||||
_ExcInfoType = Union[None, bool, _SysExcInfoType, Exception]
|
||||
else:
|
||||
_ExcInfoType = Union[bool, _SysExcInfoType]
|
||||
_ExcInfoType = Union[None, bool, _SysExcInfoType]
|
||||
_ArgsType = Union[Tuple[Any, ...], Dict[str, Any]]
|
||||
_FilterType = Union['Filter', Callable[['LogRecord'], int]]
|
||||
|
||||
@@ -33,54 +33,54 @@ class Logger:
|
||||
def getChild(self, suffix: str) -> 'Logger': ...
|
||||
if sys.version_info >= (3,):
|
||||
def debug(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def info(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def warning(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def warn(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def error(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def critical(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def log(self, lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def exception(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
else:
|
||||
def debug(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def info(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def warning(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def warn(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def error(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def critical(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def log(self,
|
||||
lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def exception(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def addFilter(self, filt: _FilterType) -> None: ...
|
||||
def removeFilter(self, filt: _FilterType) -> None: ...
|
||||
def filter(self, record: 'LogRecord') -> bool: ...
|
||||
@@ -220,48 +220,48 @@ class LoggerAdapter:
|
||||
def process(self, msg: Text, kwargs: MutableMapping[str, Any]) -> Tuple[str, MutableMapping[str, Any]]: ...
|
||||
if sys.version_info >= (3,):
|
||||
def debug(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def info(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def warning(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def error(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def exception(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def critical(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def log(self, lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
else:
|
||||
def debug(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def info(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def warning(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def error(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def exception(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def critical(self,
|
||||
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def log(self,
|
||||
lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def isEnabledFor(self, lvl: int) -> bool: ...
|
||||
if sys.version_info >= (3,):
|
||||
def getEffectiveLevel(self) -> int: ...
|
||||
@@ -282,46 +282,46 @@ if sys.version_info >= (3,):
|
||||
|
||||
if sys.version_info >= (3,):
|
||||
def debug(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def info(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def warning(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def warn(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def error(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def critical(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def exception(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
def log(lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
stack_info: bool = ..., extra: Dict[str, Any] = ...,
|
||||
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
|
||||
**kwargs: Any) -> None: ...
|
||||
else:
|
||||
def debug(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def info(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def warning(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def warn(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def error(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def critical(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def exception(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
def log(lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
|
||||
extra: Dict[str, Any] = ..., **kwargs: Any) -> None: ...
|
||||
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
|
||||
|
||||
def disable(lvl: int) -> None: ...
|
||||
def addLevelName(lvl: int, levelName: str) -> None: ...
|
||||
|
||||
Reference in New Issue
Block a user