Fix anext use for python 3.9

python-lapidary · May 20, 2024 · 0de562f · 0de562f
1 parent ffa0458
commit 0de562f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/httpx_auth/__init__.py b/httpx_auth/__init__.py
@@ -1,6 +1,7 @@
 from httpx_auth._authentication import (
     Basic,
     HeaderApiKey,
+    MultiAuth,
     QueryApiKey,
     SupportMultiAuth,
 )
@@ -63,6 +64,7 @@
     "OAuth2ResourceOwnerPasswordCredentials",
     "OktaResourceOwnerPasswordCredentials",
     "WakaTimeAuthorizationCode",
+    "MultiAuth",
     "SupportMultiAuth",
     "JsonTokenFileCache",
     "TokenMemoryCache",

diff --git a/httpx_auth/_authentication.py b/httpx_auth/_authentication.py
@@ -3,7 +3,7 @@
 import httpx
 
 
-class _MultiAuth(httpx.Auth):
+class MultiAuth(httpx.Auth):
     """Authentication using multiple authentication methods."""
 
     def __init__(self, *authentication_modes):
@@ -16,29 +16,29 @@ def auth_flow(
             next(authentication_mode.auth_flow(request))
         yield request
 
-    def __add__(self, other) -> "_MultiAuth":
-        if isinstance(other, _MultiAuth):
-            return _MultiAuth(*self.authentication_modes, *other.authentication_modes)
-        return _MultiAuth(*self.authentication_modes, other)
+    def __add__(self, other) -> "MultiAuth":
+        if isinstance(other, MultiAuth):
+            return MultiAuth(*self.authentication_modes, *other.authentication_modes)
+        return MultiAuth(*self.authentication_modes, other)
 
-    def __and__(self, other) -> "_MultiAuth":
-        if isinstance(other, _MultiAuth):
-            return _MultiAuth(*self.authentication_modes, *other.authentication_modes)
-        return _MultiAuth(*self.authentication_modes, other)
+    def __and__(self, other) -> "MultiAuth":
+        if isinstance(other, MultiAuth):
+            return MultiAuth(*self.authentication_modes, *other.authentication_modes)
+        return MultiAuth(*self.authentication_modes, other)
 
 
 class SupportMultiAuth:
     """Inherit from this class to be able to use your class with httpx_auth provided authentication classes."""
 
-    def __add__(self, other) -> _MultiAuth:
-        if isinstance(other, _MultiAuth):
-            return _MultiAuth(self, *other.authentication_modes)
-        return _MultiAuth(self, other)
+    def __add__(self, other) -> MultiAuth:
+        if isinstance(other, MultiAuth):
+            return MultiAuth(self, *other.authentication_modes)
+        return MultiAuth(self, other)
 
-    def __and__(self, other) -> _MultiAuth:
-        if isinstance(other, _MultiAuth):
-            return _MultiAuth(self, *other.authentication_modes)
-        return _MultiAuth(self, other)
+    def __and__(self, other) -> MultiAuth:
+        if isinstance(other, MultiAuth):
+            return MultiAuth(self, *other.authentication_modes)
+        return MultiAuth(self, other)
 
 
 class HeaderApiKey(httpx.Auth, SupportMultiAuth):