Address feedback and fix runtime errors

MagicStack · Jul 19, 2020 · 4fef52f · 4fef52f
1 parent 3bf8c02
commit 4fef52f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/asyncpg/cluster.py b/asyncpg/cluster.py
@@ -131,9 +131,10 @@ def get_status(self) -> str:
     async def connect(self,
                       loop: typing.Optional[asyncio.AbstractEventLoop] = None,
                       **kwargs: typing.Any) -> 'connection.Connection':
-        conn_info: typing.Optional[typing.Any] = self.get_connection_spec()
-        conn_info.update(kwargs)  # type: ignore[union-attr]
-        return await asyncpg.connect(loop=loop, **conn_info)  # type: ignore[misc]  # noqa: E501
+        conn_info = typing.cast(typing.Dict[str, typing.Any],
+                                self.get_connection_spec())
+        conn_info.update(kwargs)
+        return await asyncpg.connect(loop=loop, **conn_info)
 
     def init(self, **settings: str) -> str:
         """Initialize cluster."""
@@ -307,12 +308,17 @@ def _get_connection_spec(self) -> typing.Optional[_ConnectionSpec]:
 
         return None
 
-    def get_connection_spec(self) -> typing.Optional[_ConnectionSpec]:
+    def get_connection_spec(self) -> _ConnectionSpec:
         status = self.get_status()
         if status != 'running':
             raise ClusterError('cluster is not running')
 
-        return self._get_connection_spec()
+        spec = self._get_connection_spec()
+
+        if spec is None:
+            raise ClusterError('cannot determine server connection address')
+
+        return spec
 
     def override_connection_spec(self, **kwargs: str) -> None:
         self._connection_spec_override = typing.cast(_ConnectionSpec, kwargs)

diff --git a/asyncpg/connection.py b/asyncpg/connection.py
@@ -45,11 +45,11 @@
 _AnyCallable = typing.Callable[..., typing.Any]
 
 OutputType = typing.Union[typing.AnyStr,
-                          os.PathLike[typing.AnyStr],
+                          os.PathLike,
                           typing.IO[typing.AnyStr],
                           _Writer]
 SourceType = typing.Union[typing.AnyStr,
-                          os.PathLike[typing.AnyStr],
+                          os.PathLike,
                           typing.IO[typing.AnyStr],
                           typing.AsyncIterable[bytes]]
 

diff --git a/tests/test_copy.py b/tests/test_copy.py
@@ -13,7 +13,6 @@
 
 import asyncpg
 from asyncpg import _testbase as tb
-from asyncpg import compat
 
 
 class TestCopyFrom(tb.ConnectedTestCase):
@@ -467,7 +466,6 @@ class _Source:
                 def __init__(self):
                     self.rowcount = 0
 
-                @compat.aiter_compat
                 def __aiter__(self):
                     return self
 
@@ -507,7 +505,6 @@ class _Source:
                 def __init__(self):
                     self.rowcount = 0
 
-                @compat.aiter_compat
                 def __aiter__(self):
                     return self
 
@@ -533,7 +530,6 @@ class _Source:
                 def __init__(self):
                     self.rowcount = 0
 
-                @compat.aiter_compat
                 def __aiter__(self):
                     return self
 
@@ -564,7 +560,6 @@ def __init__(self, loop):
                     self.rowcount = 0
                     self.loop = loop
 
-                @compat.aiter_compat
                 def __aiter__(self):
                     return self