FIXUP: revert proxy_auth back to BasicAuth

Author: TimMenninger

Diff for: aiohttp/client.py

@@ -96,6 +96,7 @@
     _SENTINEL,
     EMPTY_BODY_METHODS,
     AuthBase,
+    BasicAuth,
     TimeoutHandle,
     frozen_dataclass_decorator,
     get_env_proxy_for_url,
@@ -183,7 +184,7 @@ class _RequestOptions(TypedDict, total=False):
     raise_for_status: Union[None, bool, Callable[[ClientResponse], Awaitable[None]]]
     read_until_eof: bool
     proxy: Union[StrOrURL, None]
-    proxy_auth: Union[AuthBase, None]
+    proxy_auth: Union[BasicAuth, None]
     timeout: "Union[ClientTimeout, _SENTINEL, None]"
     ssl: Union[SSLContext, bool, Fingerprint]
     server_hostname: Union[str, None]
@@ -270,7 +271,7 @@ def __init__(
         cookies: Optional[LooseCookies] = None,
         headers: Optional[LooseHeaders] = None,
         proxy: Optional[StrOrURL] = None,
-        proxy_auth: Optional[AuthBase] = None,
+        proxy_auth: Optional[BasicAuth] = None,
         skip_auto_headers: Optional[Iterable[str]] = None,
         auth: Optional[AuthBase] = None,
         json_serialize: JSONEncoder = json.dumps,
@@ -440,7 +441,7 @@ async def _request(
         ] = None,
         read_until_eof: bool = True,
         proxy: Optional[StrOrURL] = None,
-        proxy_auth: Optional[AuthBase] = None,
+        proxy_auth: Optional[BasicAuth] = None,
         timeout: Union[ClientTimeout, _SENTINEL, None] = sentinel,
         ssl: Union[SSLContext, bool, Fingerprint] = True,
         server_hostname: Optional[str] = None,
@@ -836,7 +837,7 @@ def ws_connect(
         params: Query = None,
         headers: Optional[LooseHeaders] = None,
         proxy: Optional[StrOrURL] = None,
-        proxy_auth: Optional[AuthBase] = None,
+        proxy_auth: Optional[BasicAuth] = None,
         ssl: Union[SSLContext, bool, Fingerprint] = True,
         server_hostname: Optional[str] = None,
         proxy_headers: Optional[LooseHeaders] = None,
@@ -884,7 +885,7 @@ async def _ws_connect(
         params: Query = None,
         headers: Optional[LooseHeaders] = None,
         proxy: Optional[StrOrURL] = None,
-        proxy_auth: Optional[AuthBase] = None,
+        proxy_auth: Optional[BasicAuth] = None,
         ssl: Union[SSLContext, bool, Fingerprint] = True,
         server_hostname: Optional[str] = None,
         proxy_headers: Optional[LooseHeaders] = None,

Diff for: aiohttp/client_reqrep.py

@@ -188,7 +188,7 @@ class ConnectionKey(NamedTuple):
     is_ssl: bool
     ssl: Union[SSLContext, bool, Fingerprint]
     proxy: Optional[URL]
-    proxy_auth: Optional[AuthBase]
+    proxy_auth: Optional[BasicAuth]
     proxy_headers_hash: Optional[int]  # hash(CIMultiDict)
 
 
@@ -240,7 +240,7 @@ def __init__(
         loop: asyncio.AbstractEventLoop,
         response_class: Optional[Type["ClientResponse"]] = None,
         proxy: Optional[URL] = None,
-        proxy_auth: Optional[AuthBase] = None,
+        proxy_auth: Optional[BasicAuth] = None,
         timer: Optional[BaseTimerContext] = None,
         session: Optional["ClientSession"] = None,
         ssl: Union[SSLContext, bool, Fingerprint] = True,
@@ -565,7 +565,7 @@ def update_expect_continue(self, expect: bool = False) -> None:
     def update_proxy(
         self,
         proxy: Optional[URL],
-        proxy_auth: Optional[AuthBase],
+        proxy_auth: Optional[BasicAuth],
         proxy_headers: Optional[LooseHeaders],
     ) -> None:
         self.proxy = proxy

Diff for: aiohttp/helpers.py

@@ -297,7 +297,7 @@ def netrc_from_env() -> Optional[netrc.netrc]:
 @frozen_dataclass_decorator
 class ProxyInfo:
     proxy: URL
-    proxy_auth: Optional[AuthBase]
+    proxy_auth: Optional[BasicAuth]
 
 
 def basicauth_from_netrc(netrc_obj: Optional[netrc.netrc], host: str) -> BasicAuth:
@@ -595,7 +595,7 @@ def proxies_from_env() -> Dict[str, ProxyInfo]:
     return ret
 
 
-def get_env_proxy_for_url(url: URL) -> Tuple[URL, Optional[AuthBase]]:
+def get_env_proxy_for_url(url: URL) -> Tuple[URL, Optional[BasicAuth]]:
     """Get a permitted proxy for the given URL from the env."""
     if url.host is not None and proxy_bypass(url.host):
         raise LookupError(f"Proxying is disallowed for `{url.host!r}`")

Diff for: docs/client_reference.rst

@@ -475,8 +475,8 @@ The client session supports the context manager protocol for self closing.
 
       :param proxy: Proxy URL, :class:`str` or :class:`~yarl.URL` (optional)
 
-      :param aiohttp.AuthBase proxy_auth: an object that represents proxy HTTP
-                                          Authorization (optional)
+      :param aiohttp.BasicAuth proxy_auth: an object that represents proxy HTTP
+                                           Basic Authorization (optional)
 
       :param int timeout: override the session's timeout.
 
@@ -737,8 +737,8 @@ The client session supports the context manager protocol for self closing.
 
       :param str proxy: Proxy URL, :class:`str` or :class:`~yarl.URL` (optional)
 
-      :param aiohttp.AuthBase proxy_auth: an object that represents proxy HTTP
-                                          Authorization (optional)
+      :param aiohttp.BasicAuth proxy_auth: an object that represents proxy HTTP
+                                           Basic Authorization (optional)
 
       :param ssl: SSL validation mode. ``True`` for default SSL check
                   (:func:`ssl.create_default_context` is used),
@@ -947,8 +947,8 @@ certification chaining.
 
    :param proxy: Proxy URL, :class:`str` or :class:`~yarl.URL` (optional)
 
-   :param aiohttp.AuthBase proxy_auth: an object that represents proxy HTTP
-                                       Authorization (optional)
+   :param aiohttp.BasicAuth proxy_auth: an object that represents proxy HTTP
+                                        Basic Authorization (optional)
 
    :param timeout: a :class:`ClientTimeout` settings structure, 300 seconds (5min)
         total timeout, 30 seconds socket connect timeout by default.