diff --git a/stdlib/2and3/logging/__init__.pyi b/stdlib/2and3/logging/__init__.pyi index a38edcc7e..6de08245f 100644 --- a/stdlib/2and3/logging/__init__.pyi +++ b/stdlib/2and3/logging/__init__.pyi @@ -42,8 +42,8 @@ else: class Filterer(object): filters: List[Filter] def __init__(self) -> None: ... - def addFilter(self, filter: Filter) -> None: ... - def removeFilter(self, filter: Filter) -> None: ... + def addFilter(self, filter: _FilterType) -> None: ... + def removeFilter(self, filter: _FilterType) -> None: ... def filter(self, record: LogRecord) -> bool: ... class Logger(Filterer): @@ -160,8 +160,6 @@ class Logger(Filterer): exc_info: Optional[_ExcInfoType] = ..., extra: Optional[Dict[str, Any]] = ..., ) -> None: ... # undocumented - def addFilter(self, filt: _FilterType) -> None: ... - def removeFilter(self, filt: _FilterType) -> None: ... def filter(self, record: LogRecord) -> bool: ... def addHandler(self, hdlr: Handler) -> None: ... def removeHandler(self, hdlr: Handler) -> None: ... @@ -211,8 +209,6 @@ class Handler(Filterer): def release(self) -> None: ... def setLevel(self, level: _Level) -> None: ... def setFormatter(self, fmt: Formatter) -> None: ... - def addFilter(self, filt: _FilterType) -> None: ... - def removeFilter(self, filt: _FilterType) -> None: ... def filter(self, record: LogRecord) -> bool: ... def flush(self) -> None: ... def close(self) -> None: ... @@ -246,7 +242,7 @@ class Formatter: def format(self, record: LogRecord) -> str: ... def formatTime(self, record: LogRecord, datefmt: Optional[str] = ...) -> str: ... - def formatException(self, exc_info: _SysExcInfoType) -> str: ... + def formatException(self, ei: _SysExcInfoType) -> str: ... if sys.version_info >= (3,): def formatMessage(self, record: LogRecord) -> str: ... # undocumented def formatStack(self, stack_info: str) -> str: ... @@ -373,10 +369,10 @@ class LoggerAdapter: def log(self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def isEnabledFor(self, lvl: int) -> bool: ... + def isEnabledFor(self, level: int) -> bool: ... if sys.version_info >= (3,): def getEffectiveLevel(self) -> int: ... - def setLevel(self, lvl: Union[int, str]) -> None: ... + def setLevel(self, level: Union[int, str]) -> None: ... def hasHandlers(self) -> bool: ... if sys.version_info >= (3, 6): def _log( @@ -468,11 +464,11 @@ else: extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... fatal = critical -def disable(lvl: int) -> None: ... -def addLevelName(lvl: int, levelName: str) -> None: ... -def getLevelName(lvl: Union[int, str]) -> Any: ... +def disable(level: int) -> None: ... +def addLevelName(level: int, levelName: str) -> None: ... +def getLevelName(level: Union[int, str]) -> Any: ... -def makeLogRecord(attrdict: Mapping[str, Any]) -> LogRecord: ... +def makeLogRecord(dict: Mapping[str, Any]) -> LogRecord: ... if sys.version_info >= (3, 8): def basicConfig(*, filename: Optional[_Path] = ..., filemode: str = ..., diff --git a/stdlib/2and3/logging/handlers.pyi b/stdlib/2and3/logging/handlers.pyi index 0bc578aaf..66eaadb29 100644 --- a/stdlib/2and3/logging/handlers.pyi +++ b/stdlib/2and3/logging/handlers.pyi @@ -95,7 +95,7 @@ class SocketHandler(Handler): def __init__(self, host: str, port: int) -> None: ... def makeSocket(self) -> SocketType: ... def makePickle(self, record: LogRecord) -> bytes: ... - def send(self, packet: bytes) -> None: ... + def send(self, s: bytes) -> None: ... def createSocket(self) -> None: ... diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index 6158bbffd..56c63ea9e 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -292,23 +292,11 @@ lib2to3.pytree.BasePattern.__new__ lib2to3.pytree.BasePattern.type lib2to3.pytree.NegatedPattern.match lib2to3.pytree.NegatedPattern.match_seq -logging.Formatter.formatException -logging.Handler.addFilter -logging.Handler.removeFilter -logging.Logger.addFilter -logging.Logger.removeFilter -logging.LoggerAdapter.isEnabledFor -logging.LoggerAdapter.setLevel logging.RootLogger.__init__ -logging.addLevelName logging.disable -logging.getLevelName -logging.handlers.DatagramHandler.send logging.handlers.NTEventLogHandler.__init__ logging.handlers.SocketHandler.makeSocket -logging.handlers.SocketHandler.send logging.handlers.SysLogHandler.__init__ -logging.makeLogRecord logging.shutdown mailbox.Babyl.__init__ mailbox.MH.__init__