From e8ea32c013cec2ae067517f3355d9a3a7a67b31d Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Sat, 27 Nov 2021 23:07:13 -0800
Subject: [PATCH 1/2] logging: fix various __init__ methods

---
 stdlib/logging/__init__.pyi | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi
index c972559c9b60..1e23cba0de8d 100644
--- a/stdlib/logging/__init__.pyi
+++ b/stdlib/logging/__init__.pyi
@@ -285,7 +285,17 @@ class Formatter:
     else:
         default_msec_format: str
 
-    if sys.version_info >= (3, 8):
+    if sys.version_info >= (3, 10):
+        def __init__(
+            self,
+            fmt: str | None = ...,
+            datefmt: str | None = ...,
+            style: _FormatStyle = ...,
+            validate: bool = ...,
+            *,
+            defaults: dict[str, Any] | None = ...,
+        ) -> None: ...
+    elif sys.version_info >= (3, 8):
         def __init__(
             self, fmt: str | None = ..., datefmt: str | None = ..., style: _FormatStyle = ..., validate: bool = ...
         ) -> None: ...
@@ -357,7 +367,7 @@ class LoggerAdapter(Generic[_L]):
     manager: Manager  # undocumented
     if sys.version_info >= (3, 10):
         extra: Mapping[str, object] | None
-        def __init__(self, logger: _L, extra: Mapping[str, object] | None) -> None: ...
+        def __init__(self, logger: _L, extra: Mapping[str, object] | None = ...) -> None: ...
     else:
         extra: Mapping[str, object]
         def __init__(self, logger: _L, extra: Mapping[str, object]) -> None: ...
@@ -745,7 +755,10 @@ class PercentStyle(object):  # undocumented
     if sys.version_info >= (3, 8):
         validation_pattern: Pattern[str]
     _fmt: str
-    def __init__(self, fmt: str) -> None: ...
+    if sys.version_info >= (3, 10):
+        def __init__(self, fmt: str, *, defaults: dict[str, Any] | None = ...) -> None: ...
+    else:
+        def __init__(self, fmt: str) -> None: ...
     def usesTime(self) -> bool: ...
     if sys.version_info >= (3, 8):
         def validate(self) -> None: ...

From b63afd56b784b06685548592689d51e98e042940 Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Tue, 30 Nov 2021 22:04:20 -0800
Subject: [PATCH 2/2] use mapping

---
 stdlib/logging/__init__.pyi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi
index 1e23cba0de8d..70d6a1fda2fc 100644
--- a/stdlib/logging/__init__.pyi
+++ b/stdlib/logging/__init__.pyi
@@ -293,7 +293,7 @@ class Formatter:
             style: _FormatStyle = ...,
             validate: bool = ...,
             *,
-            defaults: dict[str, Any] | None = ...,
+            defaults: Mapping[str, Any] | None = ...,
         ) -> None: ...
     elif sys.version_info >= (3, 8):
         def __init__(
@@ -756,7 +756,7 @@ class PercentStyle(object):  # undocumented
         validation_pattern: Pattern[str]
     _fmt: str
     if sys.version_info >= (3, 10):
-        def __init__(self, fmt: str, *, defaults: dict[str, Any] | None = ...) -> None: ...
+        def __init__(self, fmt: str, *, defaults: Mapping[str, Any] | None = ...) -> None: ...
     else:
         def __init__(self, fmt: str) -> None: ...
     def usesTime(self) -> bool: ...