From: Kar Petrosyan <92274156+karpetrosyan@users.noreply.github.com>
Date: Thu, 13 Jun 2024 12:45:46 +0000 (+0400)
Subject: Merge branch 'master' into network-options
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a35ffe6b54a60f1d76b5b89f3392250e45525b92;p=thirdparty%2Fhttpx.git

Merge branch 'master' into network-options
---

a35ffe6b54a60f1d76b5b89f3392250e45525b92
diff --cc httpx/_config.py
index 1af8a456,6662ea80..736cfdf3
--- a/httpx/_config.py
+++ b/httpx/_config.py
@@@ -12,12 -14,8 +14,14 @@@ from ._types import CertTypes, HeaderTy
  from ._urls import URL
  from ._utils import get_ca_bundle_from_env
  
+ __all__ = ["Limits", "Proxy", "Timeout", "create_ssl_context"]
+ 
 +SOCKET_OPTION = typing.Union[
 +    typing.Tuple[int, int, int],
 +    typing.Tuple[int, int, typing.Union[bytes, bytearray]],
 +    typing.Tuple[int, int, None, int],
 +]
 +
  DEFAULT_CIPHERS = ":".join(
      [
          "ECDHE+AESGCM",
diff --cc httpx/_transports/default.py
index 0829b570,33db416d..1896059e
--- a/httpx/_transports/default.py
+++ b/httpx/_transports/default.py
@@@ -61,7 -57,15 +64,17 @@@ from .base import AsyncBaseTransport, B
  T = typing.TypeVar("T", bound="HTTPTransport")
  A = typing.TypeVar("A", bound="AsyncHTTPTransport")
  
 +
++__all__ = ["AsyncHTTPTransport", "HTTPTransport"]
++
++
+ SOCKET_OPTION = typing.Union[
+     typing.Tuple[int, int, int],
+     typing.Tuple[int, int, typing.Union[bytes, bytearray]],
+     typing.Tuple[int, int, None, int],
+ ]
+ 
 -__all__ = ["AsyncHTTPTransport", "HTTPTransport"]
 -
+ 
  @contextlib.contextmanager
  def map_httpcore_exceptions() -> typing.Iterator[None]:
      try: