github/requests
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Parameterize SupportsItems to handle Mapping key invariance (#7426)

Browse Source
This commit is contained in:
Nate Prewitt
2026-05-11 11:33:17 -06:00
committed by GitHub
parent b684dcb9bb
commit 3816cfa1ab
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/requests/_types.py
View File

@@ -20,6 +20,8 @@ from typing import (
) )
_T_co = TypeVar("_T_co", covariant=True) _T_co = TypeVar("_T_co", covariant=True)
_KT_co = TypeVar("_KT_co", covariant=True)
_VT_co = TypeVar("_VT_co", covariant=True)
@runtime_checkable @runtime_checkable
@@ -28,8 +30,8 @@ class SupportsRead(Protocol[_T_co]):
@runtime_checkable @runtime_checkable
class SupportsItems(Protocol): class SupportsItems(Protocol[_KT_co, _VT_co]):
def items(self) -> Iterable[tuple[Any, Any]]: ... def items(self) -> Iterable[tuple[_KT_co, _VT_co]]: ...
# These are needed at runtime for default_hooks() return type # These are needed at runtime for default_hooks() return type
@@ -79,7 +81,7 @@ if TYPE_CHECKING:
str | bytes | int | float | Iterable[str | bytes | int | float] | None str | bytes | int | float | Iterable[str | bytes | int | float] | None
) )
ParamsType: TypeAlias = ( ParamsType: TypeAlias = (
Mapping[_ParamsMappingKeyType, _ParamsMappingValueType] SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType]
| tuple[tuple[_ParamsMappingKeyType, _ParamsMappingValueType], ...] | tuple[tuple[_ParamsMappingKeyType, _ParamsMappingValueType], ...]
| Iterable[tuple[_ParamsMappingKeyType, _ParamsMappingValueType]] | Iterable[tuple[_ParamsMappingKeyType, _ParamsMappingValueType]]
| str | str
@@ -87,7 +89,7 @@ if TYPE_CHECKING:
| None | None
) )
KVDataType: TypeAlias = Iterable[tuple[Any, Any]] | Mapping[Any, Any] KVDataType: TypeAlias = Iterable[tuple[Any, Any]] | SupportsItems[Any, Any]
RawDataType: TypeAlias = KVDataType | str | bytes RawDataType: TypeAlias = KVDataType | str | bytes
StreamDataType: TypeAlias = SupportsRead[str | bytes] StreamDataType: TypeAlias = SupportsRead[str | bytes]

6
src/requests/utils.py
View File

@@ -147,7 +147,7 @@ if sys.platform == "win32":
def dict_to_sequence( def dict_to_sequence(
d: _t.SupportsItems | Iterable[tuple[Any, Any]], d: _t.SupportsItems[Any, Any] | Iterable[tuple[Any, Any]],
) -> Iterable[tuple[Any, Any]]: ) -> Iterable[tuple[Any, Any]]:
"""Returns an internal sequence dictionary update.""" """Returns an internal sequence dictionary update."""
@@ -371,10 +371,10 @@ def from_key_val_list(
def to_key_val_list(value: None) -> None: ... def to_key_val_list(value: None) -> None: ...
@overload @overload
def to_key_val_list( def to_key_val_list(
value: Mapping[_KT, _VT] | Iterable[tuple[_KT, _VT]], value: _t.SupportsItems[_KT, _VT] | Iterable[tuple[_KT, _VT]],
) -> list[tuple[_KT, _VT]]: ... ) -> list[tuple[_KT, _VT]]: ...
def to_key_val_list( def to_key_val_list(
value: Mapping[_KT, _VT] | Iterable[tuple[_KT, _VT]] | None, value: _t.SupportsItems[_KT, _VT] | Iterable[tuple[_KT, _VT]] | None,
) -> list[tuple[_KT, _VT]] | None: ) -> list[tuple[_KT, _VT]] | None:
"""Take an object and test to see if it can be represented as a """Take an object and test to see if it can be represented as a
dictionary. If it can be, return a list of tuples, e.g., dictionary. If it can be, return a list of tuples, e.g.,