punkreq 0.2.4__tar.gz → 0.3.0__tar.gz

{punkreq-0.2.4 → punkreq-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: punkreq
-Version: 0.2.4
+Version: 0.3.0
 Summary: An async HTTP client built on httpunk
 Project-URL: Homepage, https://github.com/gi0baro/punkreq
 Project-URL: Funding, https://github.com/sponsors/gi0baro
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -23,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Free Threading :: 3 - Stable
 Classifier: Topic :: Internet :: WWW/HTTP
-Requires-Python: >=3.10
-Requires-Dist: httpunk~=0.4.4
+Requires-Python: >=3.11
+Requires-Dist: httpunk~=0.5.0
 Provides-Extra: brotli
 Requires-Dist: brotli~=1.2.0; extra == 'brotli'
 Provides-Extra: tonio

{punkreq-0.2.4 → punkreq-0.3.0}/punkreq/_connect.py

@@ -11,7 +11,7 @@ from httpunk.h2.client import H2Connection
 from ._exceptions import ConnectError, UnsupportedProtocol
 
 
-__all__ = ["Connector", "Origin", "connect_errors", "create_ssl_context", "enter_connection", "origin_for_url"]
+__all__ = ["Connector", "Origin", "connect_errors", "create_ssl_context", "origin_for_url"]
 
 DEFAULT_PORTS = {"http": 80, "https": 443}
 
@@ -94,19 +94,6 @@ def connect_errors(backend: typing.Any) -> tuple[type[BaseException], ...]:
     return (OSError, ssl.SSLError, HTTPunkError, *backend.broken_transport_errors)
 
 
-async def enter_connection(conn: typing.Any, transport: typing.Any, backend: typing.Any) -> typing.Any:
-    """Run `conn`'s HTTP handshake (`__aenter__`) and return it. Until that
-    completes the transport we dialed is still ours to close: httpunk closes
-    it on `__aexit__`, which a failed or interrupted `__aenter__` never
-    reaches (h2 waits there for the peer's SETTINGS, pumps already running)."""
-    try:
-        await conn.__aenter__()
-    except BaseException:
-        backend.close_transport(transport)
-        raise
-    return conn
-
-
 class Connector:
     """The default connector: dial `origin` and return the protocol-matching
     httpunk connection, entered."""
@@ -142,14 +129,15 @@ class Connector:
     async def __call__(self, origin: Origin) -> H1Connection | H2Connection:
         try:
             if origin.scheme == "https":
-                conn, stream = await self._connect_tls(origin)
+                conn = await self._connect_tls(origin)
             else:
-                conn, stream = await self._connect_tcp(origin)
-            return await enter_connection(conn, stream, self._backend)
+                conn = await self._connect_tcp(origin)
+            await conn.__aenter__()
+            return conn
         except connect_errors(self._backend) as exc:
             raise ConnectError(f"Failed to connect to {origin}: {exc}")
 
-    async def _connect_tls(self, origin: Origin) -> tuple[H1Connection | H2Connection, typing.Any]:
+    async def _connect_tls(self, origin: Origin) -> H1Connection | H2Connection:
         # our context already carries the offer; a backend-created default one
         # (no context given) is configured per dial
         alpn = None if self._ssl_context is not None else self.alpn
@@ -157,12 +145,12 @@ class Connector:
             origin.host, origin.port, alpn=alpn, ssl_context=self._ssl_context
         )
         if selected == "h2" or not self._http1:
-            return H2Connection(stream, authority=origin.authority, scheme="https", backend=self._backend), stream
-        return H1Connection(stream, authority=origin.authority, backend=self._backend), stream
+            return H2Connection(stream, authority=origin.authority, scheme="https", backend=self._backend)
+        return H1Connection(stream, authority=origin.authority, backend=self._backend)
 
-    async def _connect_tcp(self, origin: Origin) -> tuple[H1Connection | H2Connection, typing.Any]:
+    async def _connect_tcp(self, origin: Origin) -> H1Connection | H2Connection:
         stream = await self._backend.connect_tcp(origin.host, origin.port)
         if not self._http1:
             # h2 prior knowledge over cleartext (reqwest's http2_prior_knowledge)
-            return H2Connection(stream, authority=origin.authority, scheme="http", backend=self._backend), stream
-        return H1Connection(stream, authority=origin.authority, backend=self._backend), stream
+            return H2Connection(stream, authority=origin.authority, scheme="http", backend=self._backend)
+        return H1Connection(stream, authority=origin.authority, backend=self._backend)

{punkreq-0.2.4 → punkreq-0.3.0}/punkreq/_pool.py

@@ -11,14 +11,14 @@ Concept mapping (hyper-util `client/pool/*.rs` ≡ `httpunk.util.pool` ≡ here)
   ≡ `_HostState.shared` + `.dialing` + `.mode`. Waiters re-attempt internally
   instead of surfacing `Canceled` — the same retry-by-calling-again
   semantics. A closed shared conn is ditched and redialed at checkout
-  (`Singled::poll_ready` reset; httpunk F35).
+  (`Singled::poll_ready` reset, as httpunk's `Singleton` does).
 * `Cache` (idle set, drop-returns-to-cache) ≡ `_HostState.idle` + `release()`.
   The park check (`discard or closed or busy`) matches httpunk's `_Lease`:
   `closed` mirrors `Cached::poll_ready`-sets-`is_closed` + `Drop` skipping
-  the put; `busy` is the runtime-forced extra (httpunk D3); closing on a
-  failed exchange instead of re-parking is httpunk's F51 choice. Like
-  httpunk's `Cache` (F50), there is no checkout-vs-connect race: an empty
-  idle set dials directly.
+  the put; `busy` is the runtime-forced extra httpunk also adds; closing on
+  a failed exchange instead of re-parking is httpunk's choice too. Like
+  httpunk's `Cache`, there is no checkout-vs-connect race: an empty idle
+  set dials directly.
 
 Policy layered on top (owner-owned, per the modern pool's design — its only
 culling surface is `Cache::retain(predicate)`, everything else is the

{punkreq-0.2.4 → punkreq-0.3.0}/punkreq/_proxies.py

@@ -10,7 +10,7 @@ from httpunk.h2.client import H2Connection
 from httpunk.util.proxy import Matcher
 
 from ._config import Proxy
-from ._connect import Connector, Origin, connect_errors, enter_connection
+from ._connect import Connector, Origin, connect_errors
 from ._exceptions import ConnectError, ProxyError
 from ._headers import Headers
 from ._urls import URL
@@ -112,7 +112,8 @@ class ProxyConnector:
         transport = await self._dial_proxy(intercept)
         conn = H1Connection(transport, authority=origin.authority, backend=self._backend)
         setattr(conn, PROXY_ATTR, ProxyInfo(auth=intercept.basic_auth(), headers=self._config.headers))
-        return await enter_connection(conn, transport, self._backend)
+        await conn.__aenter__()
+        return conn
 
     async def _tunnel(self, origin: Origin, intercept: typing.Any) -> typing.Any:
         transport = await self._dial_proxy(intercept)
@@ -152,4 +153,5 @@ class ProxyConnector:
             conn = H2Connection(tls, authority=origin.authority, scheme="https", backend=self._backend)
         else:
             conn = H1Connection(tls, authority=origin.authority, backend=self._backend)
-        return await enter_connection(conn, tls, self._backend)
+        await conn.__aenter__()
+        return conn

punkreq-0.3.0/punkreq/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.0"

{punkreq-0.2.4 → punkreq-0.3.0}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
 
 [project]
 name = "punkreq"
-version = "0.2.4"
+version = "0.3.0"
 description = "An async HTTP client built on httpunk"
 readme = "README.md"
 license = "BSD-3-Clause"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 authors = [
     { name = "Giovanni Barillari", email = "g@baro.dev" }
@@ -22,7 +22,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: Free Threading :: 3 - Stable",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -32,7 +31,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "httpunk~=0.4.4",
+    "httpunk~=0.5.0",
 ]
 
 [project.optional-dependencies]

punkreq-0.2.4/punkreq/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.4"