From a08ef43e40fc940050cf962913677285b58493ef Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 12 Jul 2021 00:16:25 +0200 Subject: [PATCH] simplify if statements --- nominatim/db/async_connection.py | 9 ++++----- nominatim/tools/database_import.py | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nominatim/db/async_connection.py b/nominatim/db/async_connection.py index db4b89ce..a55612c8 100644 --- a/nominatim/db/async_connection.py +++ b/nominatim/db/async_connection.py @@ -40,11 +40,10 @@ class DeadlockHandler: if exc_type == psycopg2.errors.DeadlockDetected: # pylint: disable=E1101 self.handler() return True - else: - if exc_type == psycopg2.extensions.TransactionRollbackError: - if exc_value.pgcode == '40P01': - self.handler() - return True + elif exc_type == psycopg2.extensions.TransactionRollbackError \ + and exc_value.pgcode == '40P01': + self.handler() + return True if self.ignore_sql_errors and isinstance(exc_value, psycopg2.Error): LOG.info("SQL error ignored: %s", exc_value) diff --git a/nominatim/tools/database_import.py b/nominatim/tools/database_import.py index efbf2ec8..df82f9aa 100644 --- a/nominatim/tools/database_import.py +++ b/nominatim/tools/database_import.py @@ -130,9 +130,8 @@ def import_osm_data(osm_file, options, drop=False, ignore_errors=False): if drop: conn.drop_table('planet_osm_nodes') - if drop: - if options['flatnode_file']: - Path(options['flatnode_file']).unlink() + if drop and options['flatnode_file']: + Path(options['flatnode_file']).unlink() def create_tables(conn, config, reverse_only=False): -- 2.45.1