psycopg2: improve cursor_factory params (#11085)

Author: Avasam

stubs/psycopg2/psycopg2/__init__.pyi

@@ -39,21 +39,21 @@ _T_conn = TypeVar("_T_conn", bound=connection)
 def connect(
     dsn: str | None,
     connection_factory: Callable[..., _T_conn],
-    cursor_factory: Callable[..., cursor] | None = None,
+    cursor_factory: Callable[[connection, str | bytes | None], cursor] | None = None,
     **kwargs: Any,
 ) -> _T_conn: ...
 @overload
 def connect(
     dsn: str | None = None,
     *,
     connection_factory: Callable[..., _T_conn],
-    cursor_factory: Callable[..., cursor] | None = None,
+    cursor_factory: Callable[[connection, str | bytes | None], cursor] | None = None,
     **kwargs: Any,
 ) -> _T_conn: ...
 @overload
 def connect(
     dsn: str | None = None,
     connection_factory: Callable[..., connection] | None = None,
-    cursor_factory: Callable[..., cursor] | None = None,
+    cursor_factory: Callable[[connection, str | bytes | None], cursor] | None = None,
     **kwargs: Any,
 ) -> connection: ...

stubs/psycopg2/psycopg2/_psycopg.pyi

@@ -412,7 +412,7 @@ class connection:
     def binary_types(self) -> dict[Incomplete, Incomplete]: ...
     @property
     def closed(self) -> int: ...
-    cursor_factory: Callable[..., _Cursor]
+    cursor_factory: Callable[[connection, str | bytes | None], cursor]
     @property
     def dsn(self) -> str: ...
     @property
@@ -452,21 +452,21 @@ class connection:
     @overload
     def cursor(
         self, name: str | bytes | None = None, cursor_factory: None = None, withhold: bool = False, scrollable: bool | None = None
-    ) -> _Cursor: ...
+    ) -> cursor: ...
     @overload
     def cursor(
         self,
         name: str | bytes | None = None,
         *,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
     @overload
     def cursor(
         self,
         name: str | bytes | None,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...

stubs/psycopg2/psycopg2/extras.pyi

@@ -46,15 +46,15 @@ class DictConnection(_connection):
         self,
         name: str | bytes | None = None,
         *,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
     @overload
     def cursor(
         self,
         name: str | bytes | None,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
@@ -91,15 +91,15 @@ class RealDictConnection(_connection):
         self,
         name: str | bytes | None = None,
         *,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
     @overload
     def cursor(
         self,
         name: str | bytes | None,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
@@ -128,15 +128,15 @@ class NamedTupleConnection(_connection):
         self,
         name: str | bytes | None = None,
         *,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...
     @overload
     def cursor(
         self,
         name: str | bytes | None,
-        cursor_factory: Callable[..., _T_cur],
+        cursor_factory: Callable[[_connection, str | bytes | None], _T_cur],
         withhold: bool = False,
         scrollable: bool | None = None,
     ) -> _T_cur: ...