httpx2 2.1.0__tar.gz → 2.3.0__tar.gz

{httpx2-2.1.0 → httpx2-2.3.0}/.gitignore

@@ -5,6 +5,7 @@
 __pycache__/
 htmlcov/
 site/
+.wrangler/
 *.egg-info/
 venv*/
 .python-version

{httpx2-2.1.0 → httpx2-2.3.0}/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.3.0 (June 1st, 2026)
+
+### Changed
+
+* Use `truststore` instead of `certifi` for default SSL verification, loading the operating system's trust store. ([#209](https://github.com/pydantic/httpx2/pull/209))
+
+### Fixed
+
+* Raise when `verify` is a string path and a client-side `cert` is also provided to `create_ssl_context`. ([#990](https://github.com/pydantic/httpx2/pull/990))
+* Allow a `default_encoding` callable to return `None`. ([#951](https://github.com/pydantic/httpx2/pull/951))
+* Make the `zstd` import optional on Python 3.14. ([#1000](https://github.com/pydantic/httpx2/pull/1000))
+* Store elapsed time on the stream wrapper to avoid reference cycles. ([#948](https://github.com/pydantic/httpx2/pull/948))
+
+## 2.2.0 (May 16th, 2026)
+
+### Fixed
+
+* Handle multi-frame zstd streams split across chunks. ([#946](https://github.com/pydantic/httpx2/pull/946))
+
+### Changed
+
+* Lazily import the `_main` CLI module to speed up `import httpx2`. ([#947](https://github.com/pydantic/httpx2/pull/947))
+
 ## 2.1.0 (May 15th, 2026)
 
 ### Removed
@@ -47,7 +70,7 @@ Historical entries below are from upstream `encode/httpx`.
 
 ## 0.28.0 (28th November, 2024)
 
-Be aware that the default *JSON request bodies now use a more compact representation*. This is generally considered a prefered style, tho may require updates to test suites.
+Be aware that the default *JSON request bodies now use a more compact representation*. This is generally considered a preferred style, tho may require updates to test suites.
 
 The 0.28 release includes a limited set of deprecations...
 
@@ -182,7 +205,7 @@ Our revised [SSL documentation](docs/advanced/ssl.md) covers how to implement th
 
 ### Removed
 
-* The `rfc3986` dependancy has been removed. (#2252)
+* The `rfc3986` dependency has been removed. (#2252)
 
 ## 0.23.3 (4th January, 2023)
 

{httpx2-2.1.0 → httpx2-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpx2
-Version: 2.1.0
+Version: 2.3.0
 Summary: The next generation HTTP client.
 Project-URL: Changelog, https://github.com/pydantic/httpx2/blob/main/src/httpx2/CHANGELOG.md
 Project-URL: Homepage, https://github.com/pydantic/httpx2
@@ -25,9 +25,9 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.10
 Requires-Dist: anyio
-Requires-Dist: certifi
-Requires-Dist: httpcore2==2.1.0
+Requires-Dist: httpcore2==2.3.0
 Requires-Dist: idna
+Requires-Dist: truststore>=0.10
 Provides-Extra: brotli
 Requires-Dist: brotli; (platform_python_implementation == 'CPython') and extra == 'brotli'
 Requires-Dist: brotlicffi; (platform_python_implementation != 'CPython') and extra == 'brotli'
@@ -139,8 +139,6 @@ Or, to include the optional HTTP/2 support, use:
 pip install httpx2[http2]
 ```
 
-HTTPX2 requires Python 3.10+.
-
 ## Documentation
 
 Project documentation is available at [https://httpx2.pydantic.dev/](https://httpx2.pydantic.dev/).
@@ -164,7 +162,7 @@ The HTTPX2 project relies on these excellent libraries:
 * `httpcore2` - The underlying transport implementation for `httpx2`.
   * `h11` - HTTP/1.1 support.
 * `anyio` - Structured concurrency primitives, used to support both `asyncio` and `trio`.
-* `certifi` - SSL certificates.
+* `truststore` - SSL verification using the operating system's trust store.
 * `idna` - Internationalized domain name support.
 
 As well as these optional installs:
@@ -174,7 +172,7 @@ As well as these optional installs:
 * `rich` - Rich terminal support. *(Optional, with `httpx2[cli]`)*
 * `click` - Command line client support. *(Optional, with `httpx2[cli]`)*
 * `brotli` or `brotlicffi` - Decoding for "brotli" compressed responses. *(Optional, with `httpx2[brotli]`)*
-* `zstandard` - Decoding for "zstd" compressed responses on Python 3.13 and below. *(Optional, with `httpx2[zstd]`. On Python 3.14+, `zstd` is supported natively via the stdlib [`compression.zstd`](https://docs.python.org/3/library/compression.zstd.html) module.)*
+* `zstandard` - Decoding for "zstd" compressed responses on Python 3.13 and below. *(Optional, with `httpx2[zstd]`. On Python 3.14+, `zstd` is supported via the stdlib [`compression.zstd`](https://docs.python.org/3/library/compression.zstd.html) module when it is available; the `httpx2[zstd]` extra installs nothing there, so decoding falls back to `zstandard` only on 3.13 and below.)*
 
 A huge amount of credit is due to `requests` for the API layout that
 much of this work follows, as well as to `urllib3` for plenty of design
@@ -186,15 +184,16 @@ inspiration around the lower-level networking details.
 
 ## Release Information
 
-### Removed
+### Changed
 
-* Drop support for Python 3.9. ([#208](https://github.com/pydantic/httpx2/pull/208))
+* Use `truststore` instead of `certifi` for default SSL verification, loading the operating system's trust store. ([#209](https://github.com/pydantic/httpx2/pull/209))
 
-### Added
+### Fixed
 
-* Add support for Python 3.14. ([#208](https://github.com/pydantic/httpx2/pull/208))
-* Use stdlib `compression.zstd` for Zstd decompression on Python 3.14+; fall back to the `zstandard` package on older versions. ([#932](https://github.com/pydantic/httpx2/pull/932))
-* Bundle `LICENSE.md` in the sdist. ([#938](https://github.com/pydantic/httpx2/pull/938))
+* Raise when `verify` is a string path and a client-side `cert` is also provided to `create_ssl_context`. ([#990](https://github.com/pydantic/httpx2/pull/990))
+* Allow a `default_encoding` callable to return `None`. ([#951](https://github.com/pydantic/httpx2/pull/951))
+* Make the `zstd` import optional on Python 3.14. ([#1000](https://github.com/pydantic/httpx2/pull/1000))
+* Store elapsed time on the stream wrapper to avoid reference cycles. ([#948](https://github.com/pydantic/httpx2/pull/948))
 
 
 ---

{httpx2-2.1.0 → httpx2-2.3.0}/README.md

@@ -94,8 +94,6 @@ Or, to include the optional HTTP/2 support, use:
 pip install httpx2[http2]
 ```
 
-HTTPX2 requires Python 3.10+.
-
 ## Documentation
 
 Project documentation is available at [https://httpx2.pydantic.dev/](https://httpx2.pydantic.dev/).
@@ -119,7 +117,7 @@ The HTTPX2 project relies on these excellent libraries:
 * `httpcore2` - The underlying transport implementation for `httpx2`.
   * `h11` - HTTP/1.1 support.
 * `anyio` - Structured concurrency primitives, used to support both `asyncio` and `trio`.
-* `certifi` - SSL certificates.
+* `truststore` - SSL verification using the operating system's trust store.
 * `idna` - Internationalized domain name support.
 
 As well as these optional installs:
@@ -129,7 +127,7 @@ As well as these optional installs:
 * `rich` - Rich terminal support. *(Optional, with `httpx2[cli]`)*
 * `click` - Command line client support. *(Optional, with `httpx2[cli]`)*
 * `brotli` or `brotlicffi` - Decoding for "brotli" compressed responses. *(Optional, with `httpx2[brotli]`)*
-* `zstandard` - Decoding for "zstd" compressed responses on Python 3.13 and below. *(Optional, with `httpx2[zstd]`. On Python 3.14+, `zstd` is supported natively via the stdlib [`compression.zstd`](https://docs.python.org/3/library/compression.zstd.html) module.)*
+* `zstandard` - Decoding for "zstd" compressed responses on Python 3.13 and below. *(Optional, with `httpx2[zstd]`. On Python 3.14+, `zstd` is supported via the stdlib [`compression.zstd`](https://docs.python.org/3/library/compression.zstd.html) module when it is available; the `httpx2[zstd]` extra installs nothing there, so decoding falls back to `zstandard` only on 3.13 and below.)*
 
 A huge amount of credit is due to `requests` for the API layout that
 much of this work follows, as well as to `urllib3` for plenty of design

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/__init__.py

@@ -11,21 +11,6 @@ from ._transports import *
 from ._types import *
 from ._urls import *
 
-try:
-    from ._main import main
-except ImportError:  # pragma: no cover
-
-    def main() -> None:  # type: ignore
-        import sys
-
-        print(
-            "The httpx command line client could not run because the required "
-            "dependencies were not installed.\nMake sure you've installed "
-            "everything with: pip install 'httpx[cli]'"
-        )
-        sys.exit(1)
-
-
 __all__ = [
     "__description__",
     "__title__",
@@ -60,7 +45,6 @@ __all__ = [
     "InvalidURL",
     "Limits",
     "LocalProtocolError",
-    "main",
     "MockTransport",
     "NetRCAuth",
     "NetworkError",
@@ -104,3 +88,20 @@ __locals = locals()
 for __name in __all__:
     if not __name.startswith("__"):
         setattr(__locals[__name], "__module__", "httpx2")  # noqa
+
+
+def __getattr__(name: str) -> object:  # pragma: no cover
+    if name == "main":
+        import warnings
+
+        warnings.warn(
+            "`httpx2.main` is deprecated and will be removed in a future release. "
+            "Use the `httpx2` CLI entry point instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        from ._main import main
+
+        return main
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_api.py

@@ -54,41 +54,28 @@ def request(
     verify: ssl.SSLContext | str | bool = True,
     trust_env: bool = True,
 ) -> Response:
-    """
-    Sends an HTTP request.
-
-    **Parameters:**
-
-    * **method** - HTTP method for the new `Request` object: `GET`, `OPTIONS`,
-    `HEAD`, `POST`, `PUT`, `PATCH`, or `DELETE`.
-    * **url** - URL for the new `Request` object.
-    * **params** - *(optional)* Query parameters to include in the URL, as a
-    string, dictionary, or sequence of two-tuples.
-    * **content** - *(optional)* Binary content to include in the body of the
-    request, as bytes or a byte iterator.
-    * **data** - *(optional)* Form data to include in the body of the request,
-    as a dictionary.
-    * **files** - *(optional)* A dictionary of upload files to include in the
-    body of the request.
-    * **json** - *(optional)* A JSON serializable object to include in the body
-    of the request.
-    * **headers** - *(optional)* Dictionary of HTTP headers to include in the
-    request.
-    * **cookies** - *(optional)* Dictionary of Cookie items to include in the
-    request.
-    * **auth** - *(optional)* An authentication class to use when sending the
-    request.
-    * **proxy** - *(optional)* A proxy URL where all the traffic should be routed.
-    * **timeout** - *(optional)* The timeout configuration to use when sending
-    the request.
-    * **follow_redirects** - *(optional)* Enables or disables HTTP redirects.
-    * **verify** - *(optional)* Either `True` to use an SSL context with the
-    default CA bundle, `False` to disable verification, or an instance of
-    `ssl.SSLContext` to use a custom context.
-    * **trust_env** - *(optional)* Enables or disables usage of environment
-    variables for configuration.
-
-    **Returns:** `Response`
+    """Sends an HTTP request.
+
+    Parameters:
+        method: HTTP method for the new `Request` object: `GET`, `OPTIONS`, `HEAD`, `POST`, `PUT`, `PATCH`, or `DELETE`.
+        url: URL for the new `Request` object.
+        params: *(optional)* Query parameters to include in the URL, as a string, dictionary, or sequence of two-tuples.
+        content: *(optional)* Binary content to include in the body of the request, as bytes or a byte iterator.
+        data: *(optional)* Form data to include in the body of the request, as a dictionary.
+        files: *(optional)* A dictionary of upload files to include in the body of the request.
+        json: *(optional)* A JSON serializable object to include in the body of the request.
+        headers: *(optional)* Dictionary of HTTP headers to include in the request.
+        cookies: *(optional)* Dictionary of Cookie items to include in the request.
+        auth: *(optional)* An authentication class to use when sending the request.
+        proxy: *(optional)* A proxy URL where all the traffic should be routed.
+        timeout: *(optional)* The timeout configuration to use when sending the request.
+        follow_redirects: *(optional)* Enables or disables HTTP redirects.
+        verify: *(optional)* Either `True` to use an SSL context with the default CA bundle, `False` to disable
+            verification, or an instance of `ssl.SSLContext` to use a custom context.
+        trust_env: *(optional)* Enables or disables usage of environment variables for configuration.
+
+    Returns:
+        The `Response` object.
 
     Usage:
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_auth.py

@@ -12,7 +12,7 @@ from ._exceptions import ProtocolError
 from ._models import Cookies, Request, Response
 from ._utils import to_bytes, to_str, unquote
 
-if typing.TYPE_CHECKING:  # pragma: no cover
+if typing.TYPE_CHECKING:
     from hashlib import _Hash
 
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_client.py

@@ -132,43 +132,43 @@ class ClientState(enum.Enum):
 
 class BoundSyncStream(SyncByteStream):
     """
-    A byte stream that is bound to a given response instance, and that
-    ensures the `response.elapsed` is set once the response is closed.
+    A byte stream that tracks elapsed time for a response. Once closed, the
+    elapsed time is available via the `elapsed` attribute, and the response
+    can read it back from `response.stream.elapsed`.
     """
 
-    def __init__(self, stream: SyncByteStream, response: Response, start: float) -> None:
+    def __init__(self, stream: SyncByteStream, start: float) -> None:
         self._stream = stream
-        self._response = response
         self._start = start
+        self.elapsed: datetime.timedelta | None = None
 
     def __iter__(self) -> typing.Iterator[bytes]:
         for chunk in self._stream:
             yield chunk
 
     def close(self) -> None:
-        elapsed = time.perf_counter() - self._start
-        self._response.elapsed = datetime.timedelta(seconds=elapsed)
+        self.elapsed = datetime.timedelta(seconds=time.perf_counter() - self._start)
         self._stream.close()
 
 
 class BoundAsyncStream(AsyncByteStream):
     """
-    An async byte stream that is bound to a given response instance, and that
-    ensures the `response.elapsed` is set once the response is closed.
+    An async byte stream that tracks elapsed time for a response. Once closed,
+    the elapsed time is available via the `elapsed` attribute, and the response
+    can read it back from `response.stream.elapsed`.
     """
 
-    def __init__(self, stream: AsyncByteStream, response: Response, start: float) -> None:
+    def __init__(self, stream: AsyncByteStream, start: float) -> None:
         self._stream = stream
-        self._response = response
         self._start = start
+        self.elapsed: datetime.timedelta | None = None
 
     async def __aiter__(self) -> typing.AsyncIterator[bytes]:
         async for chunk in self._stream:
             yield chunk
 
     async def aclose(self) -> None:
-        elapsed = time.perf_counter() - self._start
-        self._response.elapsed = datetime.timedelta(seconds=elapsed)
+        self.elapsed = datetime.timedelta(seconds=time.perf_counter() - self._start)
         await self._stream.aclose()
 
 
@@ -189,7 +189,7 @@ class BaseClient:
         event_hooks: None | (typing.Mapping[str, list[EventHook]]) = None,
         base_url: URL | str = "",
         trust_env: bool = True,
-        default_encoding: str | typing.Callable[[bytes], str] = "utf-8",
+        default_encoding: str | typing.Callable[[bytes], str | None] = "utf-8",
     ) -> None:
         event_hooks = {} if event_hooks is None else event_hooks
 
@@ -628,7 +628,7 @@ class Client(BaseClient):
         event_hooks: None | (typing.Mapping[str, list[EventHook]]) = None,
         base_url: URL | str = "",
         transport: BaseTransport | None = None,
-        default_encoding: str | typing.Callable[[bytes], str] = "utf-8",
+        default_encoding: str | typing.Callable[[bytes], str | None] = "utf-8",
     ) -> None:
         super().__init__(
             auth=auth,
@@ -977,7 +977,7 @@ class Client(BaseClient):
         assert isinstance(response.stream, SyncByteStream)
 
         response.request = request
-        response.stream = BoundSyncStream(response.stream, response=response, start=start)
+        response.stream = BoundSyncStream(response.stream, start=start)
         self.cookies.extract_cookies(response)
         response.default_encoding = self._default_encoding
 
@@ -1330,7 +1330,7 @@ class AsyncClient(BaseClient):
         base_url: URL | str = "",
         transport: AsyncBaseTransport | None = None,
         trust_env: bool = True,
-        default_encoding: str | typing.Callable[[bytes], str] = "utf-8",
+        default_encoding: str | typing.Callable[[bytes], str | None] = "utf-8",
     ) -> None:
         super().__init__(
             auth=auth,
@@ -1680,7 +1680,7 @@ class AsyncClient(BaseClient):
 
         assert isinstance(response.stream, AsyncByteStream)
         response.request = request
-        response.stream = BoundAsyncStream(response.stream, response=response, start=start)
+        response.stream = BoundAsyncStream(response.stream, start=start)
         self.cookies.extract_cookies(response)
         response.default_encoding = self._default_encoding
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_config.py

@@ -28,34 +28,40 @@ def create_ssl_context(
     import ssl
     import warnings
 
-    import certifi
+    import truststore
 
     if verify is True:
-        if trust_env and os.environ.get("SSL_CERT_FILE"):  # pragma: nocover
+        if trust_env and os.environ.get("SSL_CERT_FILE"):  # pragma: no cover
             ctx = ssl.create_default_context(cafile=os.environ["SSL_CERT_FILE"])
-        elif trust_env and os.environ.get("SSL_CERT_DIR"):  # pragma: nocover
+        elif trust_env and os.environ.get("SSL_CERT_DIR"):  # pragma: no cover
             ctx = ssl.create_default_context(capath=os.environ["SSL_CERT_DIR"])
         else:
-            # Default case...
-            ctx = ssl.create_default_context(cafile=certifi.where())
+            # Default case: rely on the system trust store via `truststore`.
+            ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
     elif verify is False:
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.check_hostname = False
         ctx.verify_mode = ssl.CERT_NONE
-    elif isinstance(verify, str):  # pragma: nocover
+    elif isinstance(verify, str):
+        if cert:
+            raise TypeError(
+                "`verify=<str>` cannot be combined with `cert=...`. "
+                "Build an `ssl.SSLContext` and pass it as `verify=<ctx>`, "
+                "using `.load_cert_chain()` to configure the certificate chain."
+            )
         message = (
             "`verify=<str>` is deprecated. "
             "Use `verify=ssl.create_default_context(cafile=...)` "
             "or `verify=ssl.create_default_context(capath=...)` instead."
         )
         warnings.warn(message, DeprecationWarning)
-        if os.path.isdir(verify):
+        if os.path.isdir(verify):  # pragma: no cover
             return ssl.create_default_context(capath=verify)
         return ssl.create_default_context(cafile=verify)
     else:
         ctx = verify
 
-    if cert:  # pragma: nocover
+    if cert:  # pragma: no cover
         message = (
             "`cert=...` is deprecated. Use `verify=<ssl_context>` instead,"
             "with `.load_cert_chain()` to configure the certificate chain."

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_decoders.py

@@ -29,9 +29,9 @@ except ImportError:  # pragma: no cover
 
 
 # Zstandard support is optional on Python <= 3.13.
-# On Python 3.14, the stdlib includes a built-in zstd implementation, so we can support
-# it without an extra dependency.
+# On Python 3.14+, the stdlib includes an optional built-in zstd implementation.
 if typing.TYPE_CHECKING:
+    # We keep checking Python version in the type checker path because try..except doesn't help type checkers.
     if sys.version_info >= (3, 14):
         from compression.zstd import ZstdDecompressor, ZstdError
     else:
@@ -39,20 +39,22 @@ if typing.TYPE_CHECKING:
 
         ZstdDecompressor = functools.partial(_ZstdDecompressor().decompressobj)
 
-    _zstandard_installed: bool = True
+    _zstandard_installed: bool
 else:  # pragma: no cover
-    if sys.version_info >= (3, 14):
+    _zstandard_installed = False
+    try:
         from compression.zstd import ZstdDecompressor, ZstdError
 
         _zstandard_installed = True
-    else:
+    # Either Python <3.14 or the distro doesn't have `compression.zstd`.
+    except ImportError:
         try:
             from zstandard import ZstdDecompressor as _ZstdDecompressor, ZstdError
 
             ZstdDecompressor = functools.partial(_ZstdDecompressor().decompressobj)
             _zstandard_installed = True
         except ImportError:
-            _zstandard_installed = False
+            pass
 
 
 class ContentDecoder:
@@ -181,11 +183,10 @@ class BrotliDecoder(ContentDecoder):
 
 
 class ZStandardDecoder(ContentDecoder):
-    """
-    Handle 'zstd' RFC 8878 decoding.
+    """Handle 'zstd' RFC 8878 decoding.
 
-    Requires `pip install zstandard`.
-    Can be installed as a dependency of httpx using `pip install httpx[zstd]`.
+    If running on Python 3.14+ or a distro that doesn't have the `compression.zstd` stdlib module, requires either:
+    `pip install zstandard` or `pip install httpx2[zstd]`.
     """
 
     # inspired by the ZstdDecoder implementation in urllib3
@@ -199,9 +200,14 @@ class ZStandardDecoder(ContentDecoder):
         self.seen_data = False
 
     def decode(self, data: bytes) -> bytes:
+        if not data:
+            return b""
         self.seen_data = True
         output = io.BytesIO()
         try:
+            if self.decompressor.eof:
+                data = self.decompressor.unused_data + data
+                self.decompressor = ZstdDecompressor()
             output.write(self.decompressor.decompress(data))
             while self.decompressor.eof and self.decompressor.unused_data:
                 unused_data = self.decompressor.unused_data

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_main.py

@@ -180,8 +180,7 @@ def format_certificate(cert: _PeerCertRetDictType) -> str:  # pragma: no cover
             lines.append(f"*   {key}:")
             for item in value:
                 if key in ("subject", "issuer"):
-                    for sub_item in item:
-                        lines.append(f"*     {sub_item[0]}: {sub_item[1]!r}")
+                    lines.extend(f"*     {sub_item[0]}: {sub_item[1]!r}" for sub_item in item)
                 elif isinstance(item, tuple) and len(item) == 2:
                     lines.append(f"*     {item[0]}: {item[1]!r}")
                 else:

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_models.py

@@ -507,7 +507,7 @@ class Response:
         request: Request | None = None,
         extensions: ResponseExtensions | None = None,
         history: list[Response] | None = None,
-        default_encoding: str | typing.Callable[[bytes], str] = "utf-8",
+        default_encoding: str | typing.Callable[[bytes], str | None] = "utf-8",
     ) -> None:
         self.status_code = status_code
         self.headers = Headers(headers)
@@ -563,6 +563,9 @@ class Response:
         cycle to complete.
         """
         if not hasattr(self, "_elapsed"):
+            stream_elapsed: datetime.timedelta | None = getattr(self.stream, "elapsed", None)
+            if stream_elapsed is not None:
+                return stream_elapsed
             raise RuntimeError("'.elapsed' may only be accessed after the response has been read or closed.")
         return self._elapsed
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_multipart.py

@@ -117,7 +117,7 @@ class FileField:
         # This large tuple based API largely mirror's requests' API
         # It would be good to think of better APIs for this that we could
         # include in httpx 2.0 since variable length tuples(especially of 4 elements)
-        # are quite unwieldly
+        # are quite unwieldy
         if isinstance(value, tuple):
             if len(value) == 2:
                 # neither the 3rd parameter (content_type) nor the 4th (headers)

httpx2-2.3.0/httpx2/_transports/__init__.py

@@ -0,0 +1,15 @@
+from .asgi import ASGITransport
+from .base import AsyncBaseTransport, BaseTransport
+from .default import AsyncHTTPTransport, HTTPTransport
+from .mock import MockTransport
+from .wsgi import WSGITransport
+
+__all__ = [
+    "ASGITransport",
+    "AsyncBaseTransport",
+    "BaseTransport",
+    "AsyncHTTPTransport",
+    "HTTPTransport",
+    "MockTransport",
+    "WSGITransport",
+]

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_transports/asgi.py

@@ -6,7 +6,7 @@ from .._models import Request, Response
 from .._types import AsyncByteStream
 from .base import AsyncBaseTransport
 
-if typing.TYPE_CHECKING:  # pragma: no cover
+if typing.TYPE_CHECKING:
     import asyncio
 
     import trio
@@ -31,7 +31,7 @@ def is_running_trio() -> bool:
 
         if sniffio.current_async_library() == "trio":
             return True
-    except ImportError:  # pragma: nocover
+    except ImportError:  # pragma: no cover
         pass
 
     return False
@@ -70,14 +70,12 @@ class ASGITransport(AsyncBaseTransport):
     ```
 
     Arguments:
-
-    * `app` - The ASGI application.
-    * `raise_app_exceptions` - Boolean indicating if exceptions in the application
-       should be raised. Default to `True`. Can be set to `False` for use cases
-       such as testing the content of a client 500 response.
-    * `root_path` - The root path on which the ASGI application should be mounted.
-    * `client` - A two-tuple indicating the client IP and port of incoming requests.
-    ```
+        app: The ASGI application.
+        raise_app_exceptions: Boolean indicating if exceptions in the application
+            should be raised. Default to `True`. Can be set to `False` for use cases
+            such as testing the content of a client 500 response.
+        root_path: The root path on which the ASGI application should be mounted.
+        client: A two-tuple indicating the client IP and port of incoming requests.
     """
 
     def __init__(
@@ -92,10 +90,7 @@ class ASGITransport(AsyncBaseTransport):
         self.root_path = root_path
         self.client = client
 
-    async def handle_async_request(
-        self,
-        request: Request,
-    ) -> Response:
+    async def handle_async_request(self, request: Request) -> Response:
         assert isinstance(request.stream, AsyncByteStream)
 
         # ASGI scope.
@@ -121,7 +116,7 @@ class ASGITransport(AsyncBaseTransport):
         # Response.
         status_code = None
         response_headers = None
-        body_parts = []
+        body_parts: list[bytes] = []
         response_started = False
         response_complete = create_event()
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_transports/base.py

@@ -5,6 +5,7 @@ from types import TracebackType
 
 from .._models import Request, Response
 
+# TODO(Marcelo): When Python 3.10 reaches EOF, we can use `typing.Self` instead of defining those two.
 T = typing.TypeVar("T", bound="BaseTransport")
 A = typing.TypeVar("A", bound="AsyncBaseTransport")
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_transports/mock.py

@@ -26,10 +26,7 @@ class MockTransport(AsyncBaseTransport, BaseTransport):
             raise TypeError("Cannot use an async handler in a sync Client")
         return response
 
-    async def handle_async_request(
-        self,
-        request: Request,
-    ) -> Response:
+    async def handle_async_request(self, request: Request) -> Response:
         await request.aread()
         response = self.handler(request)
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_transports/wsgi.py

@@ -64,14 +64,12 @@ class WSGITransport(BaseTransport):
     ```
 
     Arguments:
-
-    * `app` - The WSGI application.
-    * `raise_app_exceptions` - Boolean indicating if exceptions in the application
-       should be raised. Default to `True`. Can be set to `False` for use cases
-       such as testing the content of a client 500 response.
-    * `script_name` - The root path on which the WSGI application should be mounted.
-    * `remote_addr` - A string indicating the client IP of incoming requests.
-    ```
+        app: The WSGI application.
+        raise_app_exceptions: Boolean indicating if exceptions in the application
+            should be raised. Default to `True`. Can be set to `False` for use cases
+            such as testing the content of a client 500 response.
+        script_name: The root path on which the WSGI application should be mounted.
+        remote_addr: A string indicating the client IP of incoming requests.
     """
 
     def __init__(

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_types.py

@@ -21,7 +21,7 @@ from typing import (
     Union,
 )
 
-if TYPE_CHECKING:  # pragma: no cover
+if TYPE_CHECKING:
     from ._auth import Auth  # noqa: F401
     from ._config import Proxy, Timeout  # noqa: F401
     from ._models import Cookies, Headers, Request  # noqa: F401

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_urlparse.py

@@ -236,8 +236,8 @@ def urlparse(url: str = "", **kwargs: str | None) -> ParseResult:
     # Replace "raw_path" with "path" and "query".
     if "raw_path" in kwargs:
         raw_path = kwargs.pop("raw_path") or ""
-        kwargs["path"], seperator, kwargs["query"] = raw_path.partition("?")
-        if not seperator:
+        kwargs["path"], separator, kwargs["query"] = raw_path.partition("?")
+        if not separator:
             kwargs["query"] = None
 
     # Ensure that IPv6 "host" addresses are always escaped with "[...]".

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_urls.py

@@ -398,7 +398,7 @@ class URL:
         return f"{self.__class__.__name__}({url!r})"
 
     @property
-    def raw(self) -> tuple[bytes, bytes, int, bytes]:  # pragma: nocover
+    def raw(self) -> tuple[bytes, bytes, int, bytes]:  # pragma: no cover
         import collections
         import warnings
 

{httpx2-2.1.0 → httpx2-2.3.0}/httpx2/_utils.py

@@ -8,7 +8,7 @@ from urllib.request import getproxies
 
 from ._types import PrimitiveData
 
-if typing.TYPE_CHECKING:  # pragma: no cover
+if typing.TYPE_CHECKING:
     from ._urls import URL
 
 

{httpx2-2.1.0 → httpx2-2.3.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling", "hatch-fancy-pypi-readme", "uv-dynamic-versioning>=0.7.0"]
+requires = ["hatchling", "hatch-fancy-pypi-readme", "uv-dynamic-versioning>=0.8.0"]
 build-backend = "hatchling.build"
 
 [tool.hatch.version]
@@ -9,6 +9,7 @@ source = "uv-dynamic-versioning"
 vcs = "git"
 style = "pep440"
 bump = true
+fallback-version = "0.0.0"
 
 [project]
 name = "httpx2"
@@ -42,7 +43,7 @@ dynamic = ["readme", "version", "dependencies"]
 
 [tool.hatch.metadata.hooks.uv-dynamic-versioning]
 dependencies = [
-    "certifi",
+    "truststore>=0.10",
     "httpcore2=={{ version }}",
     "anyio",
     "idna",
@@ -70,7 +71,7 @@ zstd = [
 ]
 
 [project.scripts]
-httpx2 = "httpx2:main"
+httpx2 = "httpx2._main:main"
 
 [project.urls]
 Changelog = "https://github.com/pydantic/httpx2/blob/main/src/httpx2/CHANGELOG.md"

httpx2-2.1.0/httpx2/_transports/__init__.py

@@ -1,15 +0,0 @@
-from .asgi import *
-from .base import *
-from .default import *
-from .mock import *
-from .wsgi import *
-
-__all__ = [
-    "ASGITransport",
-    "AsyncBaseTransport",
-    "BaseTransport",
-    "AsyncHTTPTransport",
-    "HTTPTransport",
-    "MockTransport",
-    "WSGITransport",
-]