Typing (#88)

* Typing

* Only run mypy against 'httpx' version at the moment

* Cleanup typing

* Drop erronous commit

Author: lovelydinosaur

scripts/test

@@ -5,6 +5,5 @@ if [ -d 'venv' ] ; then
     export PREFIX="venv/bin/"
 fi
 
-${PREFIX}mypy src/ahttpx
 ${PREFIX}mypy src/httpx
 ${PREFIX}pytest --cov src/httpx tests

src/ahttpx/_pool.py

@@ -7,6 +7,7 @@
 import h11
 
 from ._content import Content
+from ._headers import Headers
 from ._network import Lock, NetworkBackend, Semaphore, NetworkStream
 from ._response import Response
 from ._request import Request
@@ -253,14 +254,14 @@ async def _send_event(self, event: h11.Event) -> None:
             await self._stream.write(data)
 
     # Receive the response...
-    async def _recv_head(self) -> tuple[int, list[tuple[str, str]]]:
+    async def _recv_head(self) -> tuple[int, Headers]:
         while True:
             event = await self._recv_event()
             if isinstance(event, h11.Response):
                 code = event.status_code
-                headers = [
+                headers = Headers([
                     (k.decode("latin-1"), v.decode("latin-1")) for k, v in event.headers
-                ]
+                ])
                 return (code, headers)
 
     async def _recv_body(self) -> typing.AsyncIterator[bytes]:

src/httpx/_pool.py

@@ -7,6 +7,7 @@
 import h11
 
 from ._content import Content
+from ._headers import Headers
 from ._network import Lock, NetworkBackend, Semaphore, NetworkStream
 from ._response import Response
 from ._request import Request
@@ -253,14 +254,14 @@ def _send_event(self, event: h11.Event) -> None:
             self._stream.write(data)
 
     # Receive the response...
-    def _recv_head(self) -> tuple[int, list[tuple[str, str]]]:
+    def _recv_head(self) -> tuple[int, Headers]:
         while True:
             event = self._recv_event()
             if isinstance(event, h11.Response):
                 code = event.status_code
-                headers = [
+                headers = Headers([
                     (k.decode("latin-1"), v.decode("latin-1")) for k, v in event.headers
-                ]
+                ])
                 return (code, headers)
 
     def _recv_body(self) -> typing.Iterator[bytes]:

src/httpx/_server.py

@@ -42,6 +42,7 @@ def handle_requests(self):
                 request = httpx.Request(method, url, headers=headers, content=stream)
                 response = self._endpoint(request)
             except Exception as exc:
+                logger.error("Internal Server Error", exc_info=True)
                 content = httpx.Text("Internal Server Error")
                 response = httpx.Response(code=500, content=content)
                 self._send_head(response)
@@ -101,7 +102,7 @@ def _recv_event(self) -> h11.Event | type[h11.PAUSED]:
     def _send_head(self, response: httpx.Response):
         event = h11.Response(
             status_code=response.code,
-            headers=response.headers.items()
+            headers=list(response.headers.items())
         )
         self._send_event(event)
 
@@ -140,7 +141,7 @@ def __init__(self, handler, host: str = "127.0.0.1", port: int = 8080):
         self.port = port
         self._max_workers = 5
         self._server_socket = None
-        self._client_sockets = []
+        self._client_sockets: list[socket.socket] = []
         self._executor = None
         self._thread = None
         self._shutdown = threading.Event()