From c1b8657c5bfa445bd8ed70e5efe22aab22543607 Mon Sep 17 00:00:00 2001
From: Akuli <akuviljanen17@gmail.com>
Date: Sun, 21 Aug 2022 23:13:51 +0300
Subject: [PATCH 1/4] Add types to tkinter.colorchooser.askcolor

---
 pyrightconfig.stricter.json     | 1 -
 stdlib/tkinter/colorchooser.pyi | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
index 4ec042db84e6..2a335d75f698 100644
--- a/pyrightconfig.stricter.json
+++ b/pyrightconfig.stricter.json
@@ -13,7 +13,6 @@
         "stdlib/sqlite3/dbapi2.pyi",
         "stdlib/_tkinter.pyi",
         "stdlib/tkinter/__init__.pyi",
-        "stdlib/tkinter/colorchooser.pyi",
         "stdlib/tkinter/commondialog.pyi",
         "stdlib/tkinter/dialog.pyi",
         "stdlib/tkinter/dnd.pyi",
diff --git a/stdlib/tkinter/colorchooser.pyi b/stdlib/tkinter/colorchooser.pyi
index ac2ea187bdd5..21b1beddbc6a 100644
--- a/stdlib/tkinter/colorchooser.pyi
+++ b/stdlib/tkinter/colorchooser.pyi
@@ -1,6 +1,7 @@
 import sys
 from tkinter.commondialog import Dialog
 from typing import ClassVar
+from tkinter import _Color, Misc
 
 if sys.version_info >= (3, 9):
     __all__ = ["Chooser", "askcolor"]
@@ -8,4 +9,8 @@ if sys.version_info >= (3, 9):
 class Chooser(Dialog):
     command: ClassVar[str]
 
-def askcolor(color: str | bytes | None = ..., **options) -> tuple[None, None] | tuple[tuple[float, float, float], str]: ...
+def askcolor(color: str | bytes | None = ..., *,
+initialcolor: _Color=...,
+parent: Misc=...,
+title: str=...
+) -> tuple[None, None] | tuple[tuple[float, float, float], str]: ...

From 1bc90035c992443e392188d8ae52c4c78c7f2933 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 21 Aug 2022 20:15:48 +0000
Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stdlib/tkinter/colorchooser.pyi | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/stdlib/tkinter/colorchooser.pyi b/stdlib/tkinter/colorchooser.pyi
index 21b1beddbc6a..6746413e925e 100644
--- a/stdlib/tkinter/colorchooser.pyi
+++ b/stdlib/tkinter/colorchooser.pyi
@@ -1,7 +1,7 @@
 import sys
+from tkinter import Misc, _Color
 from tkinter.commondialog import Dialog
 from typing import ClassVar
-from tkinter import _Color, Misc
 
 if sys.version_info >= (3, 9):
     __all__ = ["Chooser", "askcolor"]
@@ -9,8 +9,6 @@ if sys.version_info >= (3, 9):
 class Chooser(Dialog):
     command: ClassVar[str]
 
-def askcolor(color: str | bytes | None = ..., *,
-initialcolor: _Color=...,
-parent: Misc=...,
-title: str=...
+def askcolor(
+    color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...
 ) -> tuple[None, None] | tuple[tuple[float, float, float], str]: ...

From 5bd34d0367c851a213f2a35cb9bdbf91e326587a Mon Sep 17 00:00:00 2001
From: Akuli <akuviljanen17@gmail.com>
Date: Mon, 22 Aug 2022 00:37:12 +0300
Subject: [PATCH 3/4] int

---
 stdlib/tkinter/colorchooser.pyi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/stdlib/tkinter/colorchooser.pyi b/stdlib/tkinter/colorchooser.pyi
index 6746413e925e..4401dc8ed575 100644
--- a/stdlib/tkinter/colorchooser.pyi
+++ b/stdlib/tkinter/colorchooser.pyi
@@ -9,6 +9,11 @@ if sys.version_info >= (3, 9):
 class Chooser(Dialog):
     command: ClassVar[str]
 
-def askcolor(
-    color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...
-) -> tuple[None, None] | tuple[tuple[float, float, float], str]: ...
+if sys.version_info >= (3, 9):
+    def askcolor(
+        color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...
+    ) -> tuple[None, None] | tuple[tuple[int, int, int], str]: ...
+else:
+    def askcolor(
+        color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...
+    ) -> tuple[None, None] | tuple[tuple[float, float, float], str]: ...

From 67237bc9b8fed2eabfd79bad7c6a87f41d1d6aa2 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 21 Aug 2022 21:37:24 +0000
Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stdlib/tkinter/colorchooser.pyi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stdlib/tkinter/colorchooser.pyi b/stdlib/tkinter/colorchooser.pyi
index 4401dc8ed575..47eb222590c6 100644
--- a/stdlib/tkinter/colorchooser.pyi
+++ b/stdlib/tkinter/colorchooser.pyi
@@ -13,6 +13,7 @@ if sys.version_info >= (3, 9):
     def askcolor(
         color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...
     ) -> tuple[None, None] | tuple[tuple[int, int, int], str]: ...
+
 else:
     def askcolor(
         color: str | bytes | None = ..., *, initialcolor: _Color = ..., parent: Misc = ..., title: str = ...