diff --git a/src/hip/_connection.py b/src/hip/_connection.py index 8d1673f..f8f4f4c 100644 --- a/src/hip/_connection.py +++ b/src/hip/_connection.py @@ -8,12 +8,12 @@ from ._body import GZipStream, HTTPStream from ._content import Content from ._headers import Headers -from ._network import Lock, NetworkBackend 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", diff --git a/src/hip/_pool.py b/src/hip/_pool.py index 189232f..812056c 100644 --- a/src/hip/_pool.py +++ b/src/hip/_pool.py @@ -7,9 +7,9 @@ from typing_extensions import Self from ._connection import Connection, ResponseStream, Transport, open_connection -from ._network import NetworkBackend, Semaphore from ._request import Request from ._urls import URL +from .backends.sync import NetworkBackend, Semaphore __all__ = [ "ConnectionPool", diff --git a/src/hip/_server.py b/src/hip/_server.py index 968260c..baf09d7 100644 --- a/src/hip/_server.py +++ b/src/hip/_server.py @@ -4,11 +4,11 @@ from ._body import HTTPStream from ._content import Text from ._headers import Headers -from ._network import NetworkBackend from ._parsers import HTTPParser from ._request import Request from ._response import Response from ._timeouts import sleep +from .backends.sync import NetworkBackend __all__ = ["Server"] diff --git a/src/hip/backends.py b/src/hip/backends.py deleted file mode 100644 index 02ecb93..0000000 --- a/src/hip/backends.py +++ /dev/null @@ -1,6 +0,0 @@ -from ._network import NetworkBackend, NetworkStream - -__all__ = [ - "NetworkBackend", - "NetworkStream", -] diff --git a/src/hip/backends/__init__.py b/src/hip/backends/__init__.py new file mode 100644 index 0000000..9189a1a --- /dev/null +++ b/src/hip/backends/__init__.py @@ -0,0 +1,3 @@ +from .sync import NetworkBackend, NetworkStream + +__all__ = ["NetworkBackend", "NetworkStream"] diff --git a/src/hip/_network.py b/src/hip/backends/sync.py similarity index 98% rename from src/hip/_network.py rename to src/hip/backends/sync.py index bd4dff5..1bc4562 100644 --- a/src/hip/_network.py +++ b/src/hip/backends/sync.py @@ -12,8 +12,8 @@ # Once we drop 3.10 support, we can use 'typing.Self'. from typing_extensions import Self -from ._streams import Stream -from ._timeouts import get_current_timeout +from .._streams import Stream +from .._timeouts import get_current_timeout __all__ = ["NetworkBackend", "NetworkStream"] diff --git a/tests/test_network.py b/tests/test_network.py index 8359ca5..c774ae6 100644 --- a/tests/test_network.py +++ b/tests/test_network.py @@ -80,7 +80,7 @@ def create_connection(address, timeout): create_connection_args.append((address, timeout)) return raw_socket - monkeypatch.setattr("hip._network.socket.create_connection", create_connection) + monkeypatch.setattr("hip.backends.sync.socket.create_connection", create_connection) stream = backend.connect_tls("example.com", 443) try: