Merge remote-tracking branch 'upstream/main' into python315

# Conflicts:
#	stdlib/@tests/stubtest_allowlists/py315.txt

Author: JelleZijlstra

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -81,10 +81,14 @@ profiling.sampling.module_utils
 profiling.sampling.opcode_utils
 profiling.sampling.sample
 
-# These conflicting aliases are just like tkinter.*.slaves in common.txt.
+# These aliases are just like the aliases named "slaves" instead of "content".
+# See common.txt.
 tkinter.Grid.content
+tkinter.Grid.grid_content
 tkinter.Pack.content
+tkinter.Pack.pack_content
 tkinter.Place.content
+tkinter.Place.place_content
 
 
 # =============================================================

stdlib/tkinter/__init__.pyi

@@ -1112,8 +1112,6 @@ class Pack:
     ) -> None: ...
     def pack_forget(self) -> None: ...
     def pack_info(self) -> _PackInfo: ...  # errors if widget hasn't been packed
-    if sys.version_info >= (3, 15):
-        def pack_content(self) -> list[Widget]: ...
     pack = pack_configure
     forget = pack_forget
     propagate = Misc.pack_propagate
@@ -1152,8 +1150,6 @@ class Place:
     ) -> None: ...
     def place_forget(self) -> None: ...
     def place_info(self) -> _PlaceInfo: ...
-    if sys.version_info >= (3, 15):
-        def place_content(self) -> list[Widget]: ...
     place = place_configure
     info = place_info
 
@@ -1191,8 +1187,6 @@ class Grid:
     def grid_forget(self) -> None: ...
     def grid_remove(self) -> None: ...
     def grid_info(self) -> _GridInfo: ...
-    if sys.version_info >= (3, 15):
-        def grid_content(self, row: int | None = None, column: int | None = None) -> list[Widget]: ...
     grid = grid_configure
     location = Misc.grid_location
     size = Misc.grid_size
@@ -3646,7 +3640,7 @@ class Text(Widget, XView, YView):
             nolinestop: bool | None = None,
             overlap: bool | None = None,
             strictlimits: bool | None = None,
-        ) -> tuple[str, ...]: ...
+        ) -> tuple[_tkinter.Tcl_Obj, ...]: ...
     else:
         def search(
             self,

stubs/Authlib/authlib/jose/rfc7517/jwk.pyi

@@ -1,5 +1,6 @@
-from _typeshed import Incomplete
-from collections.abc import Collection, Mapping
+from _typeshed import Incomplete, ReadableBuffer
+from collections.abc import Collection, Iterable, Mapping
+from typing import SupportsBytes, SupportsIndex
 
 from authlib.jose.rfc7517 import Key, KeySet
 
@@ -8,6 +9,12 @@ class JsonWebKey:
     @classmethod
     def generate_key(cls, kty, crv_or_size, options=None, is_private: bool = False): ...
     @classmethod
-    def import_key(cls, raw: Mapping[str, object], options: Mapping[str, object] | None = None) -> Key: ...
+    def import_key(
+        cls,
+        raw: (
+            str | bytes | float | Iterable[SupportsIndex] | SupportsIndex | SupportsBytes | ReadableBuffer | Mapping[str, object]
+        ),
+        options: Mapping[str, object] | None = None,
+    ) -> Key: ...
     @classmethod
     def import_key_set(cls, raw: str | Collection[str] | dict[str, object]) -> KeySet: ...