From 4246c54a12ac590b3a94ada1d82e38e12ff9a9c1 Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Wed, 6 Dec 2023 17:29:23 -0500
Subject: [PATCH] psycopg2: improve `cursor_factory` params (#11085)

---
 stubs/psycopg2/psycopg2/__init__.pyi |  6 +++---
 stubs/psycopg2/psycopg2/_psycopg.pyi |  8 ++++----
 stubs/psycopg2/psycopg2/extras.pyi   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/stubs/psycopg2/psycopg2/__init__.pyi b/stubs/psycopg2/psycopg2/__init__.pyi
index 2d3cb10f1..501a3d0f6 100644
--- a/stubs/psycopg2/psycopg2/__init__.pyi
+++ b/stubs/psycopg2/psycopg2/__init__.pyi
@@ -39,7 +39,7 @@ _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
@@ -47,13 +47,13 @@ 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: ...
diff --git a/stubs/psycopg2/psycopg2/_psycopg.pyi b/stubs/psycopg2/psycopg2/_psycopg.pyi
index abee16207..fa688be63 100644
--- a/stubs/psycopg2/psycopg2/_psycopg.pyi
+++ b/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,13 +452,13 @@ 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: ...
@@ -466,7 +466,7 @@ class connection:
     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: ...
diff --git a/stubs/psycopg2/psycopg2/extras.pyi b/stubs/psycopg2/psycopg2/extras.pyi
index 808e236b3..f732bc5ad 100644
--- a/stubs/psycopg2/psycopg2/extras.pyi
+++ b/stubs/psycopg2/psycopg2/extras.pyi
@@ -46,7 +46,7 @@ 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: ...
@@ -54,7 +54,7 @@ class DictConnection(_connection):
     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,7 +91,7 @@ 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: ...
@@ -99,7 +99,7 @@ class RealDictConnection(_connection):
     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,7 +128,7 @@ 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: ...
@@ -136,7 +136,7 @@ class NamedTupleConnection(_connection):
     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: ...