httpcore2 2.3.0__tar.gz → 2.4.0__tar.gz

{httpcore2-2.3.0 → httpcore2-2.4.0}/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.4.0 (June 11th, 2026)
+
+### Fixed
+
+* Move HTTP/2 stream events cleanup inside `_state_lock`. ([#1013](https://github.com/pydantic/httpx2/pull/1013))
+* Release the HTTP/2 semaphore permit on `NoAvailableStreamIDError`. ([#1012](https://github.com/pydantic/httpx2/pull/1012))
+* Use `RLock` instead of `Lock` to prevent a thread deadlock. ([#1008](https://github.com/pydantic/httpx2/pull/1008))
+
 ## 2.3.0 (June 1st, 2026)
 
 ### Changed

{httpcore2-2.3.0 → httpcore2-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpcore2
-Version: 2.3.0
+Version: 2.4.0
 Summary: A minimal low-level HTTP client.
 Project-URL: Changelog, https://github.com/pydantic/httpx2/blob/main/src/httpcore2/CHANGELOG.md
 Project-URL: Homepage, https://github.com/pydantic/httpx2
@@ -9,8 +9,9 @@ Author-email: Tom Christie <tom@tomchristie.com>
 Maintainer-email: "Pydantic Services Inc." <engineering@pydantic.dev>
 License-Expression: BSD-3-Clause
 License-File: LICENSE.md
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
+Classifier: Framework :: AnyIO
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: Trio
 Classifier: Intended Audience :: Developers
@@ -150,6 +151,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.4.0 (June 11th, 2026)
+
+### Fixed
+
+* Move HTTP/2 stream events cleanup inside `_state_lock`. ([#1013](https://github.com/pydantic/httpx2/pull/1013))
+* Release the HTTP/2 semaphore permit on `NoAvailableStreamIDError`. ([#1012](https://github.com/pydantic/httpx2/pull/1012))
+* Use `RLock` instead of `Lock` to prevent a thread deadlock. ([#1008](https://github.com/pydantic/httpx2/pull/1008))
+
 ## 2.3.0 (June 1st, 2026)
 
 ### Changed

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_api.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import contextlib
 import typing
+from collections.abc import Generator
 
 from ._models import URL, Extensions, HeaderTypes, Response
 from ._sync.connection_pool import ConnectionPool
@@ -55,7 +56,7 @@ def stream(
     headers: HeaderTypes = None,
     content: bytes | typing.Iterator[bytes] | None = None,
     extensions: Extensions | None = None,
-) -> typing.Iterator[Response]:
+) -> Generator[Response]:
     """
     Sends an HTTP request, returning the response within a content manager.
 

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_async/http11.py

@@ -28,11 +28,7 @@ logger = logging.getLogger("httpcore2.http11")
 
 
 # A subset of `h11.Event` types supported by `_send_event`
-H11SendEvent = typing.Union[
-    h11.Request,
-    h11.Data,
-    h11.EndOfMessage,
-]
+H11SendEvent = h11.Request | h11.Data | h11.EndOfMessage
 
 
 class HTTPConnectionState(enum.IntEnum):

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_async/http2.py

@@ -14,11 +14,7 @@ import h2.exceptions
 import h2.settings
 
 from .._backends.base import AsyncNetworkStream
-from .._exceptions import (
-    ConnectionNotAvailable,
-    LocalProtocolError,
-    RemoteProtocolError,
-)
+from .._exceptions import ConnectionNotAvailable, LocalProtocolError, RemoteProtocolError
 from .._models import Origin, Request, Response
 from .._synchronization import AsyncLock, AsyncSemaphore, AsyncShieldCancellation
 from .._trace import Trace
@@ -29,7 +25,7 @@ logger = logging.getLogger("httpcore2.http2")
 
 
 def has_body_headers(request: Request) -> bool:
-    return any(k.lower() == b"content-length" or k.lower() == b"transfer-encoding" for k, v in request.headers)
+    return any(k.lower() == b"content-length" or k.lower() == b"transfer-encoding" for k, _v in request.headers)
 
 
 class HTTPConnectionState(enum.IntEnum):
@@ -123,6 +119,7 @@ class AsyncHTTP2Connection(AsyncConnectionInterface):
         except h2.exceptions.NoAvailableStreamIDError:  # pragma: no cover
             self._used_all_stream_ids = True
             self._request_count -= 1
+            await self._max_streams_semaphore.release()
             raise ConnectionNotAvailable()
 
         try:
@@ -275,7 +272,7 @@ class AsyncHTTP2Connection(AsyncConnectionInterface):
                 break
 
         status_code = 200
-        headers = []
+        headers: list[tuple[bytes, bytes]] = []
         assert event.headers is not None
         for k, v in event.headers:
             if k == b":status":
@@ -377,8 +374,8 @@ class AsyncHTTP2Connection(AsyncConnectionInterface):
 
     async def _response_closed(self, stream_id: int) -> None:
         await self._max_streams_semaphore.release()
-        del self._events[stream_id]
         async with self._state_lock:
+            del self._events[stream_id]
             if self._connection_terminated and not self._events:
                 await self.aclose()
 

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_async/http_proxy.py

@@ -24,8 +24,8 @@ from .connection_pool import AsyncConnectionPool
 from .http11 import AsyncHTTP11Connection
 from .interfaces import AsyncConnectionInterface
 
-ByteOrStr = typing.Union[bytes, str]
-HeadersAsSequence = typing.Sequence[typing.Tuple[ByteOrStr, ByteOrStr]]
+ByteOrStr = bytes | str
+HeadersAsSequence = typing.Sequence[tuple[ByteOrStr, ByteOrStr]]
 HeadersAsMapping = typing.Mapping[ByteOrStr, ByteOrStr]
 
 
@@ -42,7 +42,7 @@ def merge_headers(
     """
     default_headers = [] if default_headers is None else list(default_headers)
     override_headers = [] if override_headers is None else list(override_headers)
-    has_override = set(key.lower() for key, value in override_headers)
+    has_override = set(key.lower() for key, _value in override_headers)
     default_headers = [(key, value) for key, value in default_headers if key.lower() not in has_override]
     return default_headers + override_headers
 
@@ -278,7 +278,7 @@ class AsyncTunnelHTTPConnection(AsyncConnectionInterface):
                 if connect_response.status < 200 or connect_response.status > 299:
                     reason_bytes = connect_response.extensions.get("reason_phrase", b"")
                     reason_str = reason_bytes.decode("ascii", errors="ignore")
-                    msg = "%d %s" % (connect_response.status, reason_str)
+                    msg = f"{connect_response.status} {reason_str}"
                     await self._connection.aclose()
                     raise ProxyError(msg)
 

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_backends/anyio.py

@@ -4,6 +4,8 @@ import ssl
 import typing
 
 import anyio
+import anyio.abc
+import anyio.streams.tls
 
 from .._exceptions import (
     ConnectError,
@@ -23,7 +25,7 @@ class AnyIOStream(AsyncNetworkStream):
         self._stream = stream
 
     async def read(self, max_bytes: int, timeout: float | None = None) -> bytes:
-        exc_map = {
+        exc_map: dict[type[Exception], type[Exception]] = {
             TimeoutError: ReadTimeout,
             anyio.BrokenResourceError: ReadError,
             anyio.ClosedResourceError: ReadError,
@@ -40,7 +42,7 @@ class AnyIOStream(AsyncNetworkStream):
         if not buffer:
             return
 
-        exc_map = {
+        exc_map: dict[type[Exception], type[Exception]] = {
             TimeoutError: WriteTimeout,
             anyio.BrokenResourceError: WriteError,
             anyio.ClosedResourceError: WriteError,
@@ -58,7 +60,7 @@ class AnyIOStream(AsyncNetworkStream):
         server_hostname: str | None = None,
         timeout: float | None = None,
     ) -> AsyncNetworkStream:
-        exc_map = {
+        exc_map: dict[type[Exception], type[Exception]] = {
             TimeoutError: ConnectTimeout,
             anyio.BrokenResourceError: ConnectError,
             anyio.EndOfStream: ConnectError,
@@ -105,7 +107,7 @@ class AnyIOBackend(AsyncNetworkBackend):
     ) -> AsyncNetworkStream:  # pragma: no cover
         if socket_options is None:
             socket_options = []
-        exc_map = {
+        exc_map: dict[type[Exception], type[Exception]] = {
             TimeoutError: ConnectTimeout,
             OSError: ConnectError,
             anyio.BrokenResourceError: ConnectError,
@@ -130,7 +132,7 @@ class AnyIOBackend(AsyncNetworkBackend):
     ) -> AsyncNetworkStream:  # pragma: no cover
         if socket_options is None:
             socket_options = []
-        exc_map = {
+        exc_map: dict[type[Exception], type[Exception]] = {
             TimeoutError: ConnectTimeout,
             OSError: ConnectError,
             anyio.BrokenResourceError: ConnectError,

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_backends/base.py

@@ -4,11 +4,7 @@ import ssl
 import time
 import typing
 
-SOCKET_OPTION = typing.Union[
-    typing.Tuple[int, int, int],
-    typing.Tuple[int, int, typing.Union[bytes, bytearray]],
-    typing.Tuple[int, int, None, int],
-]
+SOCKET_OPTION = tuple[int, int, int] | tuple[int, int, bytes | bytearray] | tuple[int, int, None, int]
 
 
 class NetworkStream:

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_exceptions.py

@@ -1,11 +1,14 @@
+from __future__ import annotations
+
 import contextlib
 import typing
+from collections.abc import Generator
 
-ExceptionMapping = typing.Mapping[typing.Type[Exception], typing.Type[Exception]]
+ExceptionMapping = typing.Mapping[type[Exception], type[Exception]]
 
 
 @contextlib.contextmanager
-def map_exceptions(map: ExceptionMapping) -> typing.Iterator[None]:
+def map_exceptions(map: ExceptionMapping) -> Generator[None]:
     try:
         yield
     except Exception as exc:  # noqa: PIE786

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_models.py

@@ -11,10 +11,10 @@ from ._utils import safe_async_iterate
 # Functions for typechecking...
 
 
-ByteOrStr = typing.Union[bytes, str]
-HeadersAsSequence = typing.Sequence[typing.Tuple[ByteOrStr, ByteOrStr]]
+ByteOrStr = bytes | str
+HeadersAsSequence = typing.Sequence[tuple[ByteOrStr, ByteOrStr]]
 HeadersAsMapping = typing.Mapping[ByteOrStr, ByteOrStr]
-HeaderTypes = typing.Union[HeadersAsSequence, HeadersAsMapping, None]
+HeaderTypes = HeadersAsSequence | HeadersAsMapping | None
 
 Extensions = typing.MutableMapping[str, typing.Any]
 
@@ -110,10 +110,10 @@ DEFAULT_PORTS = {
 def include_request_headers(
     headers: list[tuple[bytes, bytes]],
     *,
-    url: "URL",
+    url: URL,
     content: None | bytes | typing.Iterable[bytes] | typing.AsyncIterable[bytes],
 ) -> list[tuple[bytes, bytes]]:
-    headers_set = {k.lower() for k, v in headers}
+    headers_set = {k.lower() for k, _v in headers}
 
     if b"host" not in headers_set:
         default_port = DEFAULT_PORTS.get(url.scheme)
@@ -417,8 +417,7 @@ class Response:
         if self._stream_consumed:
             raise RuntimeError("Attempted to call 'for ... in response.iter_stream()' more than once.")
         self._stream_consumed = True
-        for chunk in self.stream:
-            yield chunk
+        yield from self.stream
 
     def close(self) -> None:
         if not isinstance(self.stream, typing.Iterable):  # pragma: no cover

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_sync/http11.py

@@ -28,11 +28,7 @@ logger = logging.getLogger("httpcore2.http11")
 
 
 # A subset of `h11.Event` types supported by `_send_event`
-H11SendEvent = typing.Union[
-    h11.Request,
-    h11.Data,
-    h11.EndOfMessage,
-]
+H11SendEvent = h11.Request | h11.Data | h11.EndOfMessage
 
 
 class HTTPConnectionState(enum.IntEnum):

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_sync/http2.py

@@ -14,11 +14,7 @@ import h2.exceptions
 import h2.settings
 
 from .._backends.base import NetworkStream
-from .._exceptions import (
-    ConnectionNotAvailable,
-    LocalProtocolError,
-    RemoteProtocolError,
-)
+from .._exceptions import ConnectionNotAvailable, LocalProtocolError, RemoteProtocolError
 from .._models import Origin, Request, Response
 from .._synchronization import Lock, Semaphore, ShieldCancellation
 from .._trace import Trace
@@ -29,7 +25,7 @@ logger = logging.getLogger("httpcore2.http2")
 
 
 def has_body_headers(request: Request) -> bool:
-    return any(k.lower() == b"content-length" or k.lower() == b"transfer-encoding" for k, v in request.headers)
+    return any(k.lower() == b"content-length" or k.lower() == b"transfer-encoding" for k, _v in request.headers)
 
 
 class HTTPConnectionState(enum.IntEnum):
@@ -123,6 +119,7 @@ class HTTP2Connection(ConnectionInterface):
         except h2.exceptions.NoAvailableStreamIDError:  # pragma: no cover
             self._used_all_stream_ids = True
             self._request_count -= 1
+            self._max_streams_semaphore.release()
             raise ConnectionNotAvailable()
 
         try:
@@ -275,7 +272,7 @@ class HTTP2Connection(ConnectionInterface):
                 break
 
         status_code = 200
-        headers = []
+        headers: list[tuple[bytes, bytes]] = []
         assert event.headers is not None
         for k, v in event.headers:
             if k == b":status":
@@ -377,8 +374,8 @@ class HTTP2Connection(ConnectionInterface):
 
     def _response_closed(self, stream_id: int) -> None:
         self._max_streams_semaphore.release()
-        del self._events[stream_id]
         with self._state_lock:
+            del self._events[stream_id]
             if self._connection_terminated and not self._events:
                 self.close()
 

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_sync/http_proxy.py

@@ -24,8 +24,8 @@ from .connection_pool import ConnectionPool
 from .http11 import HTTP11Connection
 from .interfaces import ConnectionInterface
 
-ByteOrStr = typing.Union[bytes, str]
-HeadersAsSequence = typing.Sequence[typing.Tuple[ByteOrStr, ByteOrStr]]
+ByteOrStr = bytes | str
+HeadersAsSequence = typing.Sequence[tuple[ByteOrStr, ByteOrStr]]
 HeadersAsMapping = typing.Mapping[ByteOrStr, ByteOrStr]
 
 
@@ -42,7 +42,7 @@ def merge_headers(
     """
     default_headers = [] if default_headers is None else list(default_headers)
     override_headers = [] if override_headers is None else list(override_headers)
-    has_override = set(key.lower() for key, value in override_headers)
+    has_override = set(key.lower() for key, _value in override_headers)
     default_headers = [(key, value) for key, value in default_headers if key.lower() not in has_override]
     return default_headers + override_headers
 
@@ -278,7 +278,7 @@ class TunnelHTTPConnection(ConnectionInterface):
                 if connect_response.status < 200 or connect_response.status > 299:
                     reason_bytes = connect_response.extensions.get("reason_phrase", b"")
                     reason_str = reason_bytes.decode("ascii", errors="ignore")
-                    msg = "%d %s" % (connect_response.status, reason_str)
+                    msg = f"{connect_response.status} {reason_str}"
                     self._connection.close()
                     raise ProxyError(msg)
 

{httpcore2-2.3.0 → httpcore2-2.4.0}/httpcore2/_synchronization.py

@@ -254,7 +254,7 @@ class ThreadLock:
     """
 
     def __init__(self) -> None:
-        self._lock = threading.Lock()
+        self._lock = threading.RLock()
 
     def __enter__(self) -> ThreadLock:
         self._lock.acquire()

{httpcore2-2.3.0 → httpcore2-2.4.0}/pyproject.toml

@@ -26,8 +26,9 @@ maintainers = [
     { name = "Pydantic Services Inc.", email = "engineering@pydantic.dev" },
 ]
 classifiers = [
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
+    "Framework :: AnyIO",
     "Framework :: AsyncIO",
     "Framework :: Trio",
     "Intended Audience :: Developers",