From 5d77d50423a7f792fe5a6707cc726f9018c97a07 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 30 Aug 2022 13:38:45 -0700 Subject: [PATCH] scripts: Help mypy resolve the psycopg2.connect overload. Signed-off-by: Anders Kaseorg --- puppet/zulip/files/postgresql/process_fts_updates | 6 ++++-- scripts/setup/reindex-textual-data | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet/zulip/files/postgresql/process_fts_updates b/puppet/zulip/files/postgresql/process_fts_updates index 722307c776..0c9a8050d5 100755 --- a/puppet/zulip/files/postgresql/process_fts_updates +++ b/puppet/zulip/files/postgresql/process_fts_updates @@ -172,7 +172,8 @@ if options.nagios_check: pg_args["user"] = options.nagios_user else: del pg_args["user"] - conn = psycopg2.connect(**pg_args) + # connection_factory=None lets mypy understand the return type + conn = psycopg2.connect(connection_factory=None, **pg_args) cursor = conn.cursor() cursor.execute("SELECT count(*) FROM fts_update_log") num = cursor.fetchall()[0][0] @@ -199,7 +200,8 @@ retries = 1 while True: try: if conn is None: - conn = psycopg2.connect(**pg_args) + # connection_factory=None lets mypy understand the return type + conn = psycopg2.connect(connection_factory=None, **pg_args) cursor = conn.cursor() retries = 30 diff --git a/scripts/setup/reindex-textual-data b/scripts/setup/reindex-textual-data index 67952064e3..617e6d25af 100755 --- a/scripts/setup/reindex-textual-data +++ b/scripts/setup/reindex-textual-data @@ -44,7 +44,8 @@ pg_args["dbname"] = settings.DATABASES["default"]["NAME"] pg_args["sslmode"] = settings.DATABASES["default"]["OPTIONS"].get("sslmode") pg_args["connect_timeout"] = "600" -conn = psycopg2.connect(**pg_args) +# connection_factory=None lets mypy understand the return type +conn = psycopg2.connect(connection_factory=None, **pg_args) conn.autocommit = True pg_server_version = conn.server_version