Tidyup (#90)

* Resolve mypy issues

* Resolve mypy issues

Author: lovelydinosaur

src/ahttpx/_client.py

@@ -153,7 +153,7 @@ async def send(self, request: Request) -> typing.AsyncIterator[Response]:
             # We've made a request-response and now need to issue a redirect request.
             request = self.build_redirect_request(request, response)
 
-    async def close(self):
+    async def aclose(self):
         pass
 
 

src/ahttpx/_headers.py

@@ -144,7 +144,7 @@ def copy_remove(self, key: str) -> "Headers":
         h = {k: v for k, v in self._dict.items() if k.lower() != key.lower()}
         return Headers(h)
 
-    def copy_update(self, update: typing.Mapping[str, str] | typing.Sequence[tuple[str, str]]) -> "Headers":
+    def copy_update(self, update: "Headers" | typing.Mapping[str, str] | None) -> "Headers":
         """
         Return a new Headers instance, removing the value of a key.
 
@@ -154,7 +154,10 @@ def copy_update(self, update: typing.Mapping[str, str] | typing.Sequence[tuple[s
         h = h.copy_update({"Accept-Encoding": "gzip"})
         assert h == httpx.Headers({"Accept": "*/*", "Accept-Encoding": "gzip", "User-Agent": "python/httpx"})
         """
-        new = Headers(update)
+        if update is None:
+            return self
+
+        new = update if isinstance(update, Headers) else Headers(update)
 
         # Remove updated items using a case-insensitive approach...
         keys = set([key.lower() for key in new.keys()])
@@ -172,7 +175,7 @@ def __getitem__(self, key: str) -> str:
                 return v
         raise KeyError(key)
 
-    def __contains__(self, key: object) -> bool:
+    def __contains__(self, key: typing.Any) -> bool:
         match = key.lower()
         return any(k.lower() == match for k in self._dict.keys())
 
@@ -185,7 +188,7 @@ def __len__(self) -> int:
     def __bool__(self) -> bool:
         return bool(self._dict)
 
-    def __eq__(self, other: object) -> bool:
+    def __eq__(self, other: typing.Any) -> bool:
         self_lower = {k.lower(): v for k, v in self.items()}
         other_lower = {k.lower(): v for k, v in Headers(other).items()}
         return self_lower == other_lower

src/httpx/_client.py

@@ -153,7 +153,7 @@ def send(self, request: Request) -> typing.Iterator[Response]:
             # We've made a request-response and now need to issue a redirect request.
             request = self.build_redirect_request(request, response)
 
-    def close(self):
+    def aclose(self):
         pass
 
 

src/httpx/_headers.py

@@ -144,7 +144,7 @@ def copy_remove(self, key: str) -> "Headers":
         h = {k: v for k, v in self._dict.items() if k.lower() != key.lower()}
         return Headers(h)
 
-    def copy_update(self, update: typing.Mapping[str, str] | typing.Sequence[tuple[str, str]]) -> "Headers":
+    def copy_update(self, update: "Headers" | typing.Mapping[str, str] | None) -> "Headers":
         """
         Return a new Headers instance, removing the value of a key.
 
@@ -154,7 +154,10 @@ def copy_update(self, update: typing.Mapping[str, str] | typing.Sequence[tuple[s
         h = h.copy_update({"Accept-Encoding": "gzip"})
         assert h == httpx.Headers({"Accept": "*/*", "Accept-Encoding": "gzip", "User-Agent": "python/httpx"})
         """
-        new = Headers(update)
+        if update is None:
+            return self
+
+        new = update if isinstance(update, Headers) else Headers(update)
 
         # Remove updated items using a case-insensitive approach...
         keys = set([key.lower() for key in new.keys()])
@@ -172,7 +175,7 @@ def __getitem__(self, key: str) -> str:
                 return v
         raise KeyError(key)
 
-    def __contains__(self, key: object) -> bool:
+    def __contains__(self, key: typing.Any) -> bool:
         match = key.lower()
         return any(k.lower() == match for k in self._dict.keys())
 
@@ -185,7 +188,7 @@ def __len__(self) -> int:
     def __bool__(self) -> bool:
         return bool(self._dict)
 
-    def __eq__(self, other: object) -> bool:
+    def __eq__(self, other: typing.Any) -> bool:
         self_lower = {k.lower(): v for k, v in self.items()}
         other_lower = {k.lower(): v for k, v in Headers(other).items()}
         return self_lower == other_lower