From f2e842b2d906dee5fadb7a02d2c5891cecf99ecd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Thu, 29 Nov 2018 12:56:01 +0100
Subject: [PATCH] Fix handling of logging args (#2635)

* Use _ArgsType for logging.makeRecord
* The "args" argument is passed to LogMessage, so passing a tuple in is fine as
well.
* Use Mapping rather than Dict, see https://bugs.python.org/issue21172
---
 stdlib/2and3/logging/__init__.pyi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stdlib/2and3/logging/__init__.pyi b/stdlib/2and3/logging/__init__.pyi
index c84635d35..c3719284d 100644
--- a/stdlib/2and3/logging/__init__.pyi
+++ b/stdlib/2and3/logging/__init__.pyi
@@ -16,7 +16,7 @@ if sys.version_info >= (3, 5):
     _ExcInfoType = Union[None, bool, _SysExcInfoType, BaseException]
 else:
     _ExcInfoType = Union[None, bool, _SysExcInfoType]
-_ArgsType = Union[Tuple[Any, ...], Dict[str, Any]]
+_ArgsType = Union[Tuple[Any, ...], Mapping[str, Any]]
 _FilterType = Union[Filter, Callable[[LogRecord], int]]
 _Level = Union[int, Text]
 if sys.version_info >= (3, 6):
@@ -114,7 +114,7 @@ class Logger(Filterer):
     def handle(self, record: LogRecord) -> None: ...
     if sys.version_info >= (3,):
         def makeRecord(self, name: str, lvl: int, fn: str, lno: int, msg: Any,
-                       args: Mapping[str, Any],
+                       args: _ArgsType,
                        exc_info: Optional[_SysExcInfoType],
                        func: Optional[str] = ...,
                        extra: Optional[Mapping[str, Any]] = ...,
@@ -122,7 +122,7 @@ class Logger(Filterer):
     else:
         def makeRecord(self,
                        name: str, lvl: int, fn: str, lno: int, msg: Any,
-                       args: Mapping[str, Any],
+                       args: _ArgsType,
                        exc_info: Optional[_SysExcInfoType],
                        func: Optional[str] = ...,
                        extra: Optional[Mapping[str, Any]] = ...) -> LogRecord: ...