Small changes across files, comments, typing

Author: michalpokusa

adafruit_httpserver/request.py

@@ -1,14 +1,17 @@
-from typing import Dict, Tuple
+try:
+    from typing import Dict, Tuple
+except ImportError:
+    pass
 
 
 class HTTPRequest:
 
     method: str
     path: str
-    query_params: Dict[str, str] = {}
+    query_params: Dict[str, str]
     http_version: str
 
-    headers: Dict[str, str] = {}
+    headers: Dict[str, str]
     body: bytes | None
 
     raw_request: bytes
@@ -21,15 +24,15 @@ def __init__(
         if raw_request is None: raise ValueError("raw_request cannot be None")
 
         try:
-            self.method, self.path, self.query_params, self.http_version = self.parse_start_line(raw_request)
-            self.headers = self.parse_headers(raw_request)
-            self.body = self.parse_body(raw_request)
+            self.method, self.path, self.query_params, self.http_version = self._parse_start_line(raw_request)
+            self.headers = self._parse_headers(raw_request)
+            self.body = self._parse_body(raw_request)
         except Exception as error:
             raise ValueError("Unparseable raw_request: ", raw_request) from error
 
 
     @staticmethod
-    def parse_start_line(raw_request: bytes) -> Tuple(str, str, Dict[str, str], str):
+    def _parse_start_line(raw_request: bytes) -> Tuple(str, str, Dict[str, str], str):
         """Parse HTTP Start line to method, path, query_params and http_version."""
 
         start_line = raw_request.decode("utf8").splitlines()[0]
@@ -45,7 +48,7 @@ def parse_start_line(raw_request: bytes) -> Tuple(str, str, Dict[str, str], str)
 
 
     @staticmethod
-    def parse_headers(raw_request: bytes) -> Dict[str, str]:
+    def _parse_headers(raw_request: bytes) -> Dict[str, str]:
         """Parse HTTP headers from raw request."""
         parsed_request_lines = raw_request.decode("utf8").splitlines()
         empty_line = parsed_request_lines.index("")
@@ -54,7 +57,7 @@ def parse_headers(raw_request: bytes) -> Dict[str, str]:
 
 
     @staticmethod
-    def parse_body(raw_request: bytes) -> Dict[str, str]:
+    def _parse_body(raw_request: bytes) -> Dict[str, str]:
         """Parse HTTP body from raw request."""
         parsed_request_lines = raw_request.decode("utf8").splitlines()
         empty_line = parsed_request_lines.index("")

adafruit_httpserver/response.py

@@ -53,7 +53,7 @@ def __init__(
     def _construct_response_bytes(
         http_version: str = "HTTP/1.1",
         status: HTTPStatus = OK_200,
-        content_type: str = "text/plain",
+        content_type: str = MIMEType.TEXT_PLAIN,
         content_length: Union[int, None] = None,
         headers: Dict[str, str] = None,
         body: str = "",
@@ -64,9 +64,9 @@ def _construct_response_bytes(
 
         headers = headers or {}
 
-        headers["Content-Type"] = content_type
-        headers["Content-Length"] = content_length if content_length is not None else len(body)
-        headers["Connection"] = "close"
+        headers.setdefault("Content-Type", content_type)
+        headers.setdefault("Content-Length", content_length if content_length is not None else len(body))
+        headers.setdefault("Connection", "close")
 
         for header, value in headers.items():
             response += f"{header}: {value}\r\n"

adafruit_httpserver/server.py

@@ -1,5 +1,5 @@
 try:
-    from typing import Any, Callable
+    from typing import Callable, Protocol
 except ImportError:
     pass
 
@@ -14,9 +14,7 @@
 class HTTPServer:
     """A basic socket-based HTTP server."""
 
-    def __init__(self, socket_source: Any) -> None:
-        # TODO: Use a Protocol for the type annotation.
-        # The Protocol could be refactored from adafruit_requests.
+    def __init__(self, socket_source: Protocol) -> None:
         """Create a server, and get it ready to run.
 
         :param socket: An object that is a source of sockets. This could be a `socketpool`
@@ -99,8 +97,8 @@ def poll(self):
 
                 handler = self.route_handlers.get(HTTPRoute(request.path, request.method), None)
 
-                # If a handler for route exists, call it.
-                if handler:
+                # If a handler for route exists and is callable, call it.
+                if handler is not None and callable(handler):
                     response = handler(request)
 
                 # If no handler exists and request method is GET, try to serve a file.