From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Nov 2022 12:29:02 +0000 (+0000)
Subject: Switch `extensions` from `Dict` to `Mapping`. (#2465)
X-Git-Tag: 0.23.2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ba3e2ad4c08772d1a826a192410fa0f1e61f171;p=thirdparty%2Fhttpx.git

Switch `extensions` from `Dict` to `Mapping`. (#2465)

* Ignore Mapping -> Dict type error

* Fix type of ResponseExtension

* Switch extensions from Dict to Mapping
---

diff --git a/httpx/_client.py b/httpx/_client.py
index f4c62ac4..2d9ff622 100644
--- a/httpx/_client.py
+++ b/httpx/_client.py
@@ -356,7 +356,7 @@ class BaseClient:
                 if isinstance(timeout, UseClientDefault)
                 else Timeout(timeout)
             )
-            extensions["timeout"] = timeout.as_dict()
+            extensions = dict(**extensions, timeout=timeout.as_dict())
         return Request(
             method,
             url,
diff --git a/httpx/_types.py b/httpx/_types.py
index 08fee30b..effed626 100644
--- a/httpx/_types.py
+++ b/httpx/_types.py
@@ -76,7 +76,7 @@ AuthTypes = Union[
 
 RequestContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]
 ResponseContent = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]
-ResponseExtensions = Dict[str, Any]
+ResponseExtensions = Mapping[str, Any]
 
 RequestData = Mapping[str, Any]
 
@@ -93,7 +93,7 @@ FileTypes = Union[
 ]
 RequestFiles = Union[Mapping[str, FileTypes], Sequence[Tuple[str, FileTypes]]]
 
-RequestExtensions = Dict[str, Any]
+RequestExtensions = Mapping[str, Any]
 
 
 class SyncByteStream: