From bc94318d8349404f7112a6214c782cfc1c290a64 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 5 Sep 2022 17:38:48 +0200 Subject: [PATCH] mypy: fix new warnings due to external type updates --- nominatim/db/async_connection.py | 3 ++- nominatim/db/connection.py | 2 +- nominatim/tools/check_database.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nominatim/db/async_connection.py b/nominatim/db/async_connection.py index a2c8fe4d..d1e542f5 100644 --- a/nominatim/db/async_connection.py +++ b/nominatim/db/async_connection.py @@ -94,7 +94,8 @@ class DBConnection: # Use a dict to hand in the parameters because async is a reserved # word in Python3. - self.conn = psycopg2.connect(**{'dsn': self.dsn, 'async': True}) + self.conn = psycopg2.connect(**{'dsn': self.dsn, 'async': True}) # type: ignore + assert self.conn self.wait() if cursor_factory is not None: diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py index 44a293d4..77d463d8 100644 --- a/nominatim/db/connection.py +++ b/nominatim/db/connection.py @@ -189,7 +189,7 @@ def connect(dsn: str) -> ConnectionContext: try: conn = psycopg2.connect(dsn, connection_factory=Connection) ctxmgr = cast(ConnectionContext, contextlib.closing(conn)) - ctxmgr.connection = cast(Connection, conn) + ctxmgr.connection = conn return ctxmgr except psycopg2.OperationalError as err: raise UsageError(f"Cannot connect to database: {err}") from err diff --git a/nominatim/tools/check_database.py b/nominatim/tools/check_database.py index 7372a49f..80358f20 100644 --- a/nominatim/tools/check_database.py +++ b/nominatim/tools/check_database.py @@ -268,7 +268,7 @@ def check_database_index_valid(conn: Connection, _: Configuration) -> CheckResul WHERE pg_index.indisvalid = false AND pg_index.indexrelid = pg_class.oid""") - broken = list(cur) + broken = [c[0] for c in cur] if broken: return CheckState.FAIL, dict(indexes='\n '.join(broken)) -- 2.45.1