Improve stubs for setup_master, ttk.Style.configure, Style.map`

Author: MarcellPerger1

stdlib/tkinter/ttk.pyi

@@ -3,8 +3,8 @@ import tkinter
 from _typeshed import MaybeNone
 from collections.abc import Callable
 from tkinter.font import _FontDescription
-from typing import Any, Literal, TypedDict, overload
-from typing_extensions import TypeAlias
+from typing import Any, Literal, TypedDict, overload, Iterable
+from typing_extensions import TypeAlias, Unpack
 
 __all__ = [
     "Button",
@@ -35,7 +35,7 @@ __all__ = [
 ]
 
 def tclobjs_to_py(adict: dict[Any, Any]) -> dict[Any, Any]: ...
-def setup_master(master=None): ...
+def setup_master(master: tkinter.Misc | None = None): ...
 
 _Padding: TypeAlias = (
     tkinter._ScreenUnits
@@ -47,15 +47,26 @@ _Padding: TypeAlias = (
 
 # from ttk_widget (aka ttk::widget) manual page, differs from tkinter._Compound
 _TtkCompound: TypeAlias = Literal["", "text", "image", tkinter._Compound]
+# Last item (option value to apply) varies between different options so use Any.
+# This doesn't have to be a tuple so also add a less precise Iterable option.
+_Statespec: TypeAlias = tuple[Unpack[tuple[str, ...]], Any] | Iterable[str | Any]
 
 class Style:
     master: tkinter.Misc
     tk: _tkinter.TkappType
     def __init__(self, master: tkinter.Misc | None = None) -> None: ...
-    def configure(self, style, query_opt=None, **kw): ...
-    def map(self, style, query_opt=None, **kw): ...
     def lookup(self, style, option, state=None, default=None): ...
     def layout(self, style, layoutspec=None): ...
+    @overload
+    def configure(self, style: str) -> dict[str, Any]: ...
+    @overload
+    def configure(self, style: str, query_opt: str, **kw: Any) -> Any: ...
+    @overload
+    def configure(self, style: str, query_opt: None = None, **kw: Any) -> None: ...
+    @overload
+    def map(self, style: str, query_opt: str) -> _Statespec: ...
+    @overload
+    def map(self, style: str, **kw: Iterable[_Statespec]) -> dict[str, _Statespec]: ...
     def element_create(self, elementname, etype, *args, **kw) -> None: ...
     def element_names(self): ...
     def element_options(self, elementname): ...