From 1f4598064300866464ed3f5b7366935a79d75fc2 Mon Sep 17 00:00:00 2001 From: karpetrosyan Date: Mon, 26 Feb 2024 13:45:21 -0500 Subject: [PATCH] Keep clients in sync --- httpx/_client.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/httpx/_client.py b/httpx/_client.py index cf3b30626d..56d6985b1e 100644 --- a/httpx/_client.py +++ b/httpx/_client.py @@ -1043,7 +1043,7 @@ def get( params: QueryParamTypes | None = None, headers: HeaderTypes | None = None, cookies: CookieTypes | None = None, - auth: AuthTypes | UseClientDefault = USE_CLIENT_DEFAULT, + auth: AuthTypes | UseClientDefault | None = USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault = USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault = USE_CLIENT_DEFAULT, extensions: RequestExtensions | None = None, @@ -1380,8 +1380,7 @@ def __init__( follow_redirects: bool = False, limits: Limits = DEFAULT_LIMITS, max_redirects: int = DEFAULT_MAX_REDIRECTS, - event_hooks: None - | (typing.Mapping[str, list[typing.Callable[..., typing.Any]]]) = None, + event_hooks: None | (typing.Mapping[str, list[EventHook]]) = None, base_url: URLTypes = "", transport: AsyncBaseTransport | None = None, app: typing.Callable[..., typing.Any] | None = None, @@ -1427,7 +1426,7 @@ def __init__( ) warnings.warn(message, DeprecationWarning) - allow_env_proxies = trust_env and transport is None + allow_env_proxies = trust_env and app is None and transport is None proxy_map = self._get_proxy_map(proxies or proxy, allow_env_proxies) self._transport = self._init_transport( @@ -1588,7 +1587,7 @@ async def stream( params: QueryParamTypes | None = None, headers: HeaderTypes | None = None, cookies: CookieTypes | None = None, - auth: AuthTypes | UseClientDefault = USE_CLIENT_DEFAULT, + auth: AuthTypes | UseClientDefault | None = USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault = USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault = USE_CLIENT_DEFAULT, extensions: RequestExtensions | None = None,