]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Adjust return type of ServerCursorHelper._fetch_gen()
authorDenis Laxalde <denis.laxalde@dalibo.com>
Mon, 12 Apr 2021 12:08:35 +0000 (14:08 +0200)
committerDenis Laxalde <denis.laxalde@dalibo.com>
Fri, 23 Apr 2021 06:50:16 +0000 (08:50 +0200)
This method returns cur._tx.load_rows() which return type is List[Row].

We now need 'type: ignore[no-any-return]' in fetchone() methods or
server cursor classes, similarly as in client cursor classes.

psycopg3/psycopg3/server_cursor.py

index 9cf4d32533ae069287abc189ac06ad7cc3ee05de..09f4541e16087942dea8c711961a504c9d2f4b70 100644 (file)
@@ -6,8 +6,8 @@ psycopg3 server-side cursor objects.
 
 import warnings
 from types import TracebackType
-from typing import Any, AsyncIterator, Generic, List, Iterator, Optional
-from typing import Sequence, Type, Tuple, TYPE_CHECKING
+from typing import AsyncIterator, Generic, List, Iterator, Optional
+from typing import Sequence, Type, TYPE_CHECKING
 
 from . import pq
 from . import sql
@@ -102,7 +102,7 @@ class ServerCursorHelper(Generic[ConnectionType]):
 
     def _fetch_gen(
         self, cur: BaseCursor[ConnectionType], num: Optional[int]
-    ) -> PQGen[List[Tuple[Any, ...]]]:
+    ) -> PQGen[List[Row]]:
         # If we are stealing the cursor, make sure we know its shape
         if not self.described:
             yield from cur._start_query()
@@ -245,7 +245,7 @@ class ServerCursor(BaseCursor["Connection"]):
             recs = self._conn.wait(self._helper._fetch_gen(self, 1))
         if recs:
             self._pos += 1
-            return recs[0]
+            return recs[0]  # type: ignore[no-any-return]
         else:
             return None
 
@@ -362,7 +362,7 @@ class AsyncServerCursor(BaseCursor["AsyncConnection"]):
             recs = await self._conn.wait(self._helper._fetch_gen(self, 1))
         if recs:
             self._pos += 1
-            return recs[0]
+            return recs[0]  # type: ignore[no-any-return]
         else:
             return None