Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ classifiers = [
"Topic :: Internet :: WWW/HTTP",
]
dependencies = [
"truststore==0.10",
"h11==0.14",
"truststore==0.10",
]
15 changes: 12 additions & 3 deletions src/ahttpx/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,18 @@


class Client:
def __init__(self):
self.url = URL("")
self.headers = Headers({"User-Agent": "dev"})
def __init__(
self,
url: URL | str | None = None,
headers: Headers | Mapping[str, str] | None = None
):
if url is None:
url = ""
if headers is None:
headers = {"User-Agent": "dev"}

self.url = URL(url)
self.headers = Headers(headers)
self.transport = ConnectionPool()
self.via = RedirectMiddleware(self.transport)

Expand Down
3 changes: 1 addition & 2 deletions src/ahttpx/_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
import types

import h11
import truststore

from ._models import Request, Response, URL
from ._network import Lock, NetworkBackend, Semaphore, NetworkStream


class ConnectionPool:
def __init__(self):
import truststore

self._connections = []
self._ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
self._network_backend = NetworkBackend()
Expand Down
22 changes: 16 additions & 6 deletions src/httpx/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,20 @@


class Client:
def __init__(self):
self.url = URL("")
self.headers = Headers({"User-Agent": "dev"})
self.transport = RedirectMiddleware(ConnectionPool())
def __init__(
self,
url: URL | str | None = None,
headers: Headers | Mapping[str, str] | None = None
):
if url is None:
url = ""
if headers is None:
headers = {"User-Agent": "dev"}

self.url = URL(url)
self.headers = Headers(headers)
self.transport = ConnectionPool()
self.via = RedirectMiddleware(self.transport)

def build_request(
self,
Expand All @@ -38,7 +48,7 @@ def request(
content: Content | Iterable[bytes] | bytes | None = None,
) -> Response:
request = self.build_request(method, url, headers=headers, content=content)
with self.transport.send(request) as response:
with self.via.send(request) as response:
response.read()
return response

Expand All @@ -51,7 +61,7 @@ def stream(
content: Content | Iterable[bytes] | bytes | None = None,
) -> Iterator[Response]:
request = self.build_request(method, url, headers=headers, content=content)
with self.transport.send(request) as response:
with self.via.send(request) as response:
yield response

def get(
Expand Down
3 changes: 1 addition & 2 deletions src/httpx/_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
import types

import h11
import truststore

from ._models import Request, Response, URL
from ._network import Lock, NetworkBackend, Semaphore, NetworkStream


class ConnectionPool:
def __init__(self):
import truststore

self._connections = []
self._ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
self._network_backend = NetworkBackend()
Expand Down