hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify if statements

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-07-12 00:16:25 +02:00
parent bc5e15996a
commit a08ef43e40
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nominatim/db/async_connection.py
View File

@@ -40,11 +40,10 @@ class DeadlockHandler:
if exc_type == psycopg2.errors.DeadlockDetected: # pylint: disable=E1101 if exc_type == psycopg2.errors.DeadlockDetected: # pylint: disable=E1101
self.handler() self.handler()
return True return True
else: elif exc_type == psycopg2.extensions.TransactionRollbackError \
if exc_type == psycopg2.extensions.TransactionRollbackError: and exc_value.pgcode == '40P01':
if exc_value.pgcode == '40P01': self.handler()
self.handler() return True
return True
if self.ignore_sql_errors and isinstance(exc_value, psycopg2.Error): if self.ignore_sql_errors and isinstance(exc_value, psycopg2.Error):
LOG.info("SQL error ignored: %s", exc_value) LOG.info("SQL error ignored: %s", exc_value)

5
nominatim/tools/database_import.py
View File

@@ -130,9 +130,8 @@ def import_osm_data(osm_file, options, drop=False, ignore_errors=False):
if drop: if drop:
conn.drop_table('planet_osm_nodes') conn.drop_table('planet_osm_nodes')
if drop: if drop and options['flatnode_file']:
if options['flatnode_file']: Path(options['flatnode_file']).unlink()
Path(options['flatnode_file']).unlink()
def create_tables(conn, config, reverse_only=False): def create_tables(conn, config, reverse_only=False):