From 23c1c394890903476122a8610bb973aa7f400b87 Mon Sep 17 00:00:00 2001 From: Andrew MacFie Date: Sat, 1 Mar 2025 19:24:21 -0500 Subject: [PATCH 1/2] Fix implicit-option --- asyncpg/connection.py | 6 +++--- asyncpg/pool.py | 4 ++-- asyncpg/prepared_stmt.py | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/asyncpg/connection.py b/asyncpg/connection.py index 3a86466c..af0a5ecf 100644 --- a/asyncpg/connection.py +++ b/asyncpg/connection.py @@ -311,7 +311,7 @@ def is_in_transaction(self): """ return self._protocol.is_in_transaction() - async def execute(self, query: str, *args, timeout: float=None) -> str: + async def execute(self, query: str, *args, timeout: typing.Optional[float]=None) -> str: """Execute an SQL command (or commands). This method can execute many SQL commands at once, when no arguments @@ -358,7 +358,7 @@ async def execute(self, query: str, *args, timeout: float=None) -> str: ) return status.decode() - async def executemany(self, command: str, args, *, timeout: float=None): + async def executemany(self, command: str, args, *, timeout: typing.Optional[float]=None): """Execute an SQL *command* for each sequence of arguments in *args*. Example: @@ -757,7 +757,7 @@ async def fetchrow( return data[0] async def fetchmany( - self, query, args, *, timeout: float=None, record_class=None + self, query, args, *, timeout: typing.Optional[float]=None, record_class=None ): """Run a query for each sequence of arguments in *args* and return the results as a list of :class:`Record`. diff --git a/asyncpg/pool.py b/asyncpg/pool.py index 2e4a7b4f..7c5f6d38 100644 --- a/asyncpg/pool.py +++ b/asyncpg/pool.py @@ -574,7 +574,7 @@ async def _get_new_connection(self): return con - async def execute(self, query: str, *args, timeout: float=None) -> str: + async def execute(self, query: str, *args, timeout: Optional[float]=None) -> str: """Execute an SQL command (or commands). Pool performs this operation using one of its connections. Other than @@ -586,7 +586,7 @@ async def execute(self, query: str, *args, timeout: float=None) -> str: async with self.acquire() as con: return await con.execute(query, *args, timeout=timeout) - async def executemany(self, command: str, args, *, timeout: float=None): + async def executemany(self, command: str, args, *, timeout: Optional[float]=None): """Execute an SQL *command* for each sequence of arguments in *args*. Pool performs this operation using one of its connections. Other than diff --git a/asyncpg/prepared_stmt.py b/asyncpg/prepared_stmt.py index d66a5ad3..0c2d335e 100644 --- a/asyncpg/prepared_stmt.py +++ b/asyncpg/prepared_stmt.py @@ -6,6 +6,7 @@ import json +import typing from . import connresource from . import cursor @@ -232,7 +233,7 @@ async def fetchmany(self, args, *, timeout=None): ) @connresource.guarded - async def executemany(self, args, *, timeout: float=None): + async def executemany(self, args, *, timeout: typing.Optional[float]=None): """Execute the statement for each sequence of arguments in *args*. :param args: An iterable containing sequences of arguments. From 59a3da43f349fe5dc1c8055fad713792711a382f Mon Sep 17 00:00:00 2001 From: Andrew MacFie Date: Sun, 2 Mar 2025 13:36:14 -0500 Subject: [PATCH 2/2] Shorten long lines --- asyncpg/connection.py | 22 +++++++++++++++++++--- asyncpg/pool.py | 15 +++++++++++++-- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/asyncpg/connection.py b/asyncpg/connection.py index af0a5ecf..fe9412ab 100644 --- a/asyncpg/connection.py +++ b/asyncpg/connection.py @@ -311,7 +311,12 @@ def is_in_transaction(self): """ return self._protocol.is_in_transaction() - async def execute(self, query: str, *args, timeout: typing.Optional[float]=None) -> str: + async def execute( + self, + query: str, + *args, + timeout: typing.Optional[float]=None, + ) -> str: """Execute an SQL command (or commands). This method can execute many SQL commands at once, when no arguments @@ -358,7 +363,13 @@ async def execute(self, query: str, *args, timeout: typing.Optional[float]=None) ) return status.decode() - async def executemany(self, command: str, args, *, timeout: typing.Optional[float]=None): + async def executemany( + self, + command: str, + args, + *, + timeout: typing.Optional[float]=None, + ): """Execute an SQL *command* for each sequence of arguments in *args*. Example: @@ -757,7 +768,12 @@ async def fetchrow( return data[0] async def fetchmany( - self, query, args, *, timeout: typing.Optional[float]=None, record_class=None + self, + query, + args, + *, + timeout: typing.Optional[float]=None, + record_class=None, ): """Run a query for each sequence of arguments in *args* and return the results as a list of :class:`Record`. diff --git a/asyncpg/pool.py b/asyncpg/pool.py index 7c5f6d38..5c7ea9ca 100644 --- a/asyncpg/pool.py +++ b/asyncpg/pool.py @@ -574,7 +574,12 @@ async def _get_new_connection(self): return con - async def execute(self, query: str, *args, timeout: Optional[float]=None) -> str: + async def execute( + self, + query: str, + *args, + timeout: Optional[float]=None, + ) -> str: """Execute an SQL command (or commands). Pool performs this operation using one of its connections. Other than @@ -586,7 +591,13 @@ async def execute(self, query: str, *args, timeout: Optional[float]=None) -> str async with self.acquire() as con: return await con.execute(query, *args, timeout=timeout) - async def executemany(self, command: str, args, *, timeout: Optional[float]=None): + async def executemany( + self, + command: str, + args, + *, + timeout: Optional[float]=None, + ): """Execute an SQL *command* for each sequence of arguments in *args*. Pool performs this operation using one of its connections. Other than