Split PoolConnectionProxy out of pool.py

Author: bryanforbes

asyncpg/compat.py

@@ -75,7 +75,10 @@ async def wait_closed(stream: asyncio.StreamWriter) -> None:
 
 
 # Workaround for https://bugs.python.org/issue37658
-async def wait_for(fut: 'asyncio.Future[_T]', timeout: float) -> _T:
+async def wait_for(
+    fut: typing.Union['asyncio.Future[_T]', typing.Awaitable[_T]],
+    timeout: typing.Optional[float]
+) -> _T:
     if timeout is None:
         return await fut
 

asyncpg/connect_utils.py

@@ -74,7 +74,7 @@ class _ConnectionParameters(typing.NamedTuple):
     ssl: typing.Optional[_ParsedSSLType]
     sslmode: typing.Optional[SSLMode]
     direct_tls: bool
-    connect_timeout: typing.Optional[float]
+    connect_timeout: float
     server_settings: typing.Optional[typing.Dict[str, str]]
 
 
@@ -285,7 +285,7 @@ def _parse_connect_dsn_and_args(*, dsn: typing.Optional[str],
                                 database: typing.Optional[str],
                                 ssl: typing.Optional[SSLType],
                                 direct_tls: bool,
-                                connect_timeout: typing.Optional[float],
+                                connect_timeout: float,
                                 server_settings: typing.Dict[str, str]) \
         -> typing.Tuple[typing.List[typing.Union[typing.Tuple[str, int], str]],
                         _ConnectionParameters]:
@@ -655,7 +655,7 @@ def _parse_connect_arguments(*, dsn: typing.Optional[str],
                              password: typing.Optional[str],
                              passfile: typing.Optional[str],
                              database: typing.Optional[str],
-                             timeout: typing.Optional[float],
+                             timeout: float,
                              command_timeout: typing.Optional[
                                  typing.Union[float, typing.SupportsFloat]],
                              statement_cache_size: int,

asyncpg/connection.py

@@ -33,7 +33,7 @@
 
 if typing.TYPE_CHECKING:
     from .protocol import protocol as _cprotocol
-    from . import pool as _pool
+    from . import pool_connection_proxy as _pool
     from . import types