fix(main): Add support for Python 3.9

Author: Uziel Silva

google/cloud/sql/connector/connector.py

@@ -537,18 +537,12 @@ async def close_async(self) -> None:
         """Helper function to cancel the cache's tasks
         and close aiohttp.ClientSession."""
         self._closed = True
+        if self._proxies:
+            await asyncio.gather(*[proxy.close() for proxy in self._proxies])
         if self._client:
             await self._client.close()
-        if self._proxy:
-            proxy_task = asyncio.gather(self._proxy)
-            try:
-                await asyncio.wait_for(proxy_task, timeout=0.1)
-            except TimeoutError:
-                # This task runs forever so it is expected to raise this exception
-                pass
         await asyncio.gather(*[cache.close() for cache in self._cache.values()])
 
-
 async def create_async_connector(
     ip_type: str | IPTypes = IPTypes.PUBLIC,
     enable_iam_auth: bool = False,

tests/unit/test_connector.py

@@ -321,6 +321,12 @@ async def test_Connector_connect_local_proxy(
                 mock_connect.assert_called_once()
                 mock_proxy.assert_called_once()
                 assert connection is True
+    
+                proxy_task = asyncio.gather(task)
+                try:
+                    await asyncio.wait_for(proxy_task, timeout=0.1)
+                except (asyncio.CancelledError, asyncio.TimeoutError, TimeoutError):
+                    pass # This task runs forever so it is expected to throw this exception
 
 
 @pytest.mark.asyncio

tests/unit/test_proxy.py

@@ -44,7 +44,7 @@ async def test_proxy_creates_folder(context: ssl.SSLContext, kwargs: Any) -> Non
     proxy_task = asyncio.gather(task)
     try:
         await asyncio.wait_for(proxy_task, timeout=0.1)
-    except TimeoutError:
+    except (asyncio.CancelledError, asyncio.TimeoutError, TimeoutError):
         pass # This task runs forever so it is expected to throw this exception
 
 @pytest.mark.usefixtures("proxy_server")