Beta: Collapse HTTPClientAsync into HTTPClient (#1239)

stripe · Feb 17, 2024 · be5b48a · be5b48a
1 parent 6ab43fa
commit be5b48a
Show file tree

Hide file tree

Showing 17 changed files with 2,974 additions and 2,858 deletions.
diff --git a/flake8_stripe/flake8_stripe.py b/flake8_stripe/flake8_stripe.py
@@ -58,6 +58,7 @@ class TypingImportsChecker:
         "Set",
         "Callable",
         "Generator",
+        "Iterable",
     ]
 
     def __init__(self, tree: ast.AST):

diff --git a/stripe/__init__.py b/stripe/__init__.py
@@ -37,7 +37,6 @@
 verify_ssl_certs: bool = True
 proxy: Optional[str] = None
 default_http_client: Optional["HTTPClient"] = None
-default_http_client_async: Optional["HTTPClientAsync"] = None
 app_info: Optional[AppInfo] = None
 enable_telemetry: bool = True
 max_network_retries: int = 0
@@ -162,7 +161,6 @@ def set_app_info(
 # HttpClient
 from stripe._http_client import (
     HTTPClient as HTTPClient,
-    HTTPClientAsync as HTTPClientAsync,
     PycurlClient as PycurlClient,
     RequestsClient as RequestsClient,
     UrlFetchClient as UrlFetchClient,

diff --git a/stripe/_api_requestor.py b/stripe/_api_requestor.py
@@ -51,9 +51,8 @@
 )
 from stripe._http_client import (
     HTTPClient,
-    HTTPClientAsync,
     new_default_http_client,
-    new_default_http_client_async,
+    new_http_client_async_fallback,
 )
 from stripe._app_info import AppInfo
 
@@ -79,7 +78,6 @@ def __init__(
     ):
         self._options = options
         self._client = client
-        self._client_async = None
 
     # In the case of client=None, we should use the current value of stripe.default_http_client
     # or lazily initialize it. Since stripe.default_http_client can change throughout the lifetime of
@@ -91,12 +89,18 @@ def _get_http_client(self) -> HTTPClient:
             global _default_proxy
 
             if not stripe.default_http_client:
+                kwargs = {
+                    "verify_ssl_certs": stripe.verify_ssl_certs,
+                    "proxy": stripe.proxy,
+                }
                 # If the stripe.default_http_client has not been set by the user
                 # yet, we'll set it here. This way, we aren't creating a new
                 # HttpClient for every request.
                 stripe.default_http_client = new_default_http_client(
-                    verify_ssl_certs=stripe.verify_ssl_certs,
-                    proxy=stripe.proxy,
+                    async_fallback_client=new_http_client_async_fallback(
+                        **kwargs
+                    ),
+                    **kwargs,
                 )
                 _default_proxy = stripe.proxy
             elif stripe.proxy != _default_proxy:
@@ -113,22 +117,6 @@ def _get_http_client(self) -> HTTPClient:
             return stripe.default_http_client
         return client
 
-    def _get_http_client_async(self) -> HTTPClientAsync:
-        client_async = self._client_async
-
-        if client_async is None:
-            if not stripe.default_http_client_async:
-                stripe.default_http_client_async = (
-                    new_default_http_client_async(
-                        verify_ssl_certs=stripe.verify_ssl_certs,
-                        proxy=stripe.proxy,
-                    )
-                )
-            assert stripe.default_http_client_async is not None
-            return stripe.default_http_client_async
-
-        return client_async
-
     def _replace_options(
         self, options: Optional[RequestOptions]
     ) -> "_APIRequestor":
@@ -762,7 +750,7 @@ async def request_raw_async(
                 rcontent,
                 rcode,
                 rheaders,
-            ) = await self._get_http_client_async().request_stream_with_retries_async(
+            ) = await self._get_http_client().request_stream_with_retries_async(
                 method,
                 abs_url,
                 headers,
@@ -775,7 +763,7 @@ async def request_raw_async(
                 rcontent,
                 rcode,
                 rheaders,
-            ) = await self._get_http_client_async().request_with_retries_async(
+            ) = await self._get_http_client().request_with_retries_async(
                 method,
                 abs_url,
                 headers,