Fixups (#78)

Author: lovelydinosaur

scripts/docs

@@ -80,9 +80,8 @@ md.treeprocessors.register(
 
 
 def not_found():
-    headers = {'Content-Type': 'text/plain'}
-    content = b'Not Found'
-    return httpx.Response(404, headers=headers, content=content)
+    text = httpx.Text('Not Found')
+    return httpx.Response(404, content=text)
 
 
 def web_server(request):
@@ -95,8 +94,8 @@ def web_server(request):
     state.file = file
     content = md.convert(text)
     html = template.render(content=content).encode('utf-8')
-    headers = {'Content-Type': 'text/html; charset=utf-8'}
-    return httpx.Response(200, headers=headers, content=html)
+    content = httpx.HTML(html)
+    return httpx.Response(200, content=html)
 
 
 @click.group()

src/ahttpx/_models.py

@@ -114,10 +114,11 @@ def __init__(
             # The presence of a message-body in a request is signaled by the
             # inclusion of a Content-Length or Transfer-Encoding header field in
             # the request's message-headers.
-            if self.stream.size is None:
+            content_length: int | None = self.stream.size
+            if content_length is None:
                 self.headers = self.headers.copy_set("Transfer-Encoding", "chunked")
-            elif self.stream.size > 0:
-                self.headers = self.headers.copy_set("Content-Length", str(stream.size))
+            elif content_length > 0:
+                self.headers = self.headers.copy_set("Content-Length", str(content_length))
 
     async def read(self):
         self.body = b"".join([part async for part in self.stream])
@@ -160,10 +161,15 @@ def __init__(
         # MUST NOT include a message-body. All other responses do include a
         # message-body, although it MAY be of zero length.
         if code >= 200 and code != 204 and code != 304:
-            if self.stream.size is None:
+            content_length: int | None = self.stream.size
+            if content_length is None:
                 self.headers = self.headers.copy_set("Transfer-Encoding", "chunked")
             else:
-                self.headers = self.headers.copy_set("Content-Length", str(stream.size))
+                self.headers = self.headers.copy_set("Content-Length", str(content_length))
+
+    @property
+    def reason_phrase(self):
+        return _codes.get(self.code, "Unknown Status Code")
 
     async def read(self):
         self.body = b"".join([part async for part in self.stream])
@@ -173,5 +179,4 @@ def close(self):
         self.stream = ClosedStream()
 
     def __repr__(self):
-        phrase = _codes.get(self.code, "UNKNOWN")
-        return f"<Response [{self.code} {phrase}]>"
+        return f"<Response [{self.code} {self.reason_phrase}]>"

src/httpx/_content.py

@@ -1,6 +1,4 @@
-import json
 import os
-import re
 import typing
 import urllib.parse
 
@@ -319,6 +317,8 @@ def __init__(self, data: typing.Any) -> None:
         self._data = data
 
     def encode(self) -> tuple[Stream, str]:
+        import json
+
         content = json.dumps(
             self._data,
             ensure_ascii=False,

src/httpx/_headers.py

@@ -1,9 +1,6 @@
 import typing
 
-
-__all__ = [
-    "Headers",
-]
+__all__ = ["Headers"]
 
 
 class Headers(typing.Mapping[str, str]):

src/httpx/_models.py

@@ -114,10 +114,11 @@ def __init__(
             # The presence of a message-body in a request is signaled by the
             # inclusion of a Content-Length or Transfer-Encoding header field in
             # the request's message-headers.
-            if self.stream.size is None:
+            content_length: int | None = self.stream.size
+            if content_length is None:
                 self.headers = self.headers.copy_set("Transfer-Encoding", "chunked")
-            elif self.stream.size > 0:
-                self.headers = self.headers.copy_set("Content-Length", str(stream.size))
+            elif content_length > 0:
+                self.headers = self.headers.copy_set("Content-Length", str(content_length))
 
     def read(self):
         self.body = b"".join([part for part in self.stream])
@@ -160,10 +161,15 @@ def __init__(
         # MUST NOT include a message-body. All other responses do include a
         # message-body, although it MAY be of zero length.
         if code >= 200 and code != 204 and code != 304:
-            if self.stream.size is None:
+            content_length: int | None = self.stream.size
+            if content_length is None:
                 self.headers = self.headers.copy_set("Transfer-Encoding", "chunked")
             else:
-                self.headers = self.headers.copy_set("Content-Length", str(stream.size))
+                self.headers = self.headers.copy_set("Content-Length", str(content_length))
+
+    @property
+    def reason_phrase(self):
+        return _codes.get(self.code, "Unknown Status Code")
 
     def read(self):
         self.body = b"".join([part for part in self.stream])
@@ -173,5 +179,4 @@ def close(self):
         self.stream = ClosedStream()
 
     def __repr__(self):
-        phrase = _codes.get(self.code, "UNKNOWN")
-        return f"<Response [{self.code} {phrase}]>"
+        return f"<Response [{self.code} {self.reason_phrase}]>"

src/httpx/_server.py

@@ -2,8 +2,9 @@
 import contextlib
 import select
 import socket
-import time
 import threading
+import time
+import traceback
 
 import h11
 import httpx
@@ -32,23 +33,22 @@ def __init__(self, stream, endpoint):
     def handle_requests(self):
         try:
             method, url, headers = self._recv_head()
-            print(method, url)
             stream = IterByteStream(self._recv_body())
-            print(stream)
             # TODO: Handle endpoint exceptions
             try:
                 request = httpx.Request(method, url, headers=headers, content=stream)
                 response = self._endpoint(request)
             except Exception as exc:
-                print(exc)
                 content = httpx.Text("Internal Server Error")
                 response = httpx.Response(code=500, content=content)
                 self._send_head(response)
                 self._send_body(response)
             else:
-                print(response)
                 self._send_head(response)
                 self._send_body(response)
+            finally:
+                status_line = f"{request.method} {request.url.target} [{response.code} {response.reason_phrase}]"
+                print(status_line)
         except ConnectionClosed:
             pass
         finally: