Introduce transports as a module

Author: cgl

src/hip/_client.py

@@ -1,13 +1,12 @@
 import types
 import typing
 
-from ._connection import ResponseStream, Transport
 from ._content import HTML, JSON, Binary, Content, Text, select_media
 from ._headers import Headers
-from ._pool import ConnectionPool
 from ._request import Method, Request
 from ._response import Response
 from ._urls import URL
+from .transports import ConnectionPool, ResponseStream, Transport
 
 __all__ = ["Client"]
 

src/hip/transports.py

@@ -0,0 +1,11 @@
+from .base import ResponseStream, Transport
+from .connection import Connection, open_connection
+from .pool import ConnectionPool
+
+__all__ = [
+    "Connection",
+    "ConnectionPool",
+    "ResponseStream",
+    "Transport",
+    "open_connection",
+]

src/hip/transports/__init__.py

@@ -0,0 +1,66 @@
+import types
+
+from .._content import Content
+from .._headers import Headers
+from .._request import Method, Request
+from .._response import Response, StatusCode
+from .._streams import Stream
+from .._urls import URL
+
+__all__ = ["ResponseStream", "Transport"]
+
+
+class ResponseStream(Stream):
+    def __init__(
+        self, status_code: StatusCode, headers: Headers, stream: Stream
+    ) -> None:
+        self.status_code = status_code
+        self.headers = headers
+        self.stream = stream
+
+    def read(self, size: int = -1) -> bytes:
+        return self.stream.read(size)
+
+    def close(self):
+        self.stream.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None = None,
+        exc_value: BaseException | None = None,
+        traceback: types.TracebackType | None = None,
+    ) -> None:
+        self.close()
+
+
+class Transport:
+    def send(self, request: Request) -> ResponseStream:
+        raise NotImplementedError()
+
+    def close(self):
+        pass
+
+    def request(
+        self,
+        method: Method | str,
+        url: URL | str,
+        headers: Headers | dict[str, str] | None = None,
+        content: Content | bytes | None = None,
+    ) -> Response:
+        request = Request(method, url, headers=headers, content=content)
+        with self.send(request) as stream:
+            body = stream.read()
+        return Response(stream.status_code, headers=stream.headers, content=body)
+
+    def stream(
+        self,
+        method: Method | str,
+        url: URL | str,
+        headers: Headers | dict[str, str] | None = None,
+        content: Content | bytes | None = None,
+    ) -> ResponseStream:
+        request = Request(method, url, headers=headers, content=content)
+        return self.send(request)

src/hip/transports/base.py

@@ -5,78 +5,18 @@
     # Once we drop 3.10 support, we can use 'typing.Self'.
     from typing_extensions import Self
 
-from ._body import GZipStream, HTTPStream
-from ._content import Content
-from ._headers import Headers
-from ._parsers import HTTPParser
-from ._request import Method, Request
-from ._response import Response, StatusCode
-from ._streams import Stream
-from ._urls import URL
-from .backends.sync import Lock, NetworkBackend
-
-__all__ = [
-    "Connection",
-    "ResponseStream",
-    "Transport",
-    "open_connection",
-]
-
-
-class ResponseStream(Stream):
-    def __init__(
-        self, status_code: StatusCode, headers: Headers, stream: Stream
-    ) -> None:
-        self.status_code = status_code
-        self.headers = headers
-        self.stream = stream
-
-    def read(self, size: int = -1) -> bytes:
-        return self.stream.read(size)
-
-    def close(self):
-        self.stream.close()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None = None,
-        exc_value: BaseException | None = None,
-        traceback: types.TracebackType | None = None,
-    ) -> None:
-        self.close()
-
-
-class Transport:
-    def send(self, request: Request) -> ResponseStream:
-        raise NotImplementedError()
-
-    def close(self):
-        pass
-
-    def request(
-        self,
-        method: Method | str,
-        url: URL | str,
-        headers: Headers | dict[str, str] | None = None,
-        content: Content | bytes | None = None,
-    ) -> Response:
-        request = Request(method, url, headers=headers, content=content)
-        with self.send(request) as stream:
-            body = stream.read()
-        return Response(stream.status_code, headers=stream.headers, content=body)
-
-    def stream(
-        self,
-        method: Method | str,
-        url: URL | str,
-        headers: Headers | dict[str, str] | None = None,
-        content: Content | bytes | None = None,
-    ) -> ResponseStream:
-        request = Request(method, url, headers=headers, content=content)
-        return self.send(request)
+from .._body import GZipStream, HTTPStream
+from .._content import Content
+from .._headers import Headers
+from .._parsers import HTTPParser
+from .._request import Method, Request
+from .._response import Response, StatusCode
+from .._streams import Stream
+from .._urls import URL
+from ..backends.sync import Lock, NetworkBackend
+from .base import ResponseStream, Transport
+
+__all__ = ["Connection", "open_connection"]
 
 
 class Connection(Transport):

src/hip/_connection.py src/hip/transports/connection.pysrc/hip/_connection.py renamed to src/hip/transports/connection.py

@@ -6,10 +6,18 @@
     # Once we drop 3.10 support, we can use 'typing.Self'.
     from typing_extensions import Self
 
-from ._connection import Connection, ResponseStream, Transport, open_connection
-from ._request import Request
-from ._urls import URL
-from .backends.sync import NetworkBackend, Semaphore
+from ..backends.sync import NetworkBackend, Semaphore
+from .._request import Request
+from .._urls import URL
+from .base import ResponseStream, Transport
+from .connection import (
+    Connection,
+    open_connection,
+    Connection,
+    ResponseStream,
+    Transport,
+    open_connection,
+)
 
 __all__ = [
     "ConnectionPool",