use more generic ImportError to check for module

ModuleNotFoundError was only introduced in Python 3.6.

diff --git a/nominatim/db/async_connection.py b/nominatim/db/async_connection.py
index c5d6872bf0790abfaa10f7b07d2567ba0913663d..361fe0757365c40db30eb4b3e9246ed3564e39ad 100644 (file)
--- a/nominatim/db/async_connection.py
+++ b/nominatim/db/async_connection.py
@@ -14,7 +14,7 @@ from psycopg2.extras import wait_select
 try:
     import psycopg2.errors # pylint: disable=no-name-in-module,import-error
     __has_psycopg2_errors__ = True
-except ModuleNotFoundError:
+except ImportError:
     __has_psycopg2_errors__ = False
 
 LOG = logging.getLogger()

diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index d6e8089161bc96cc71f1119b8252e3046af654b3..c167a49f81fa0a28c6cbdbf877e3646d0b2c168b 100644 (file)
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -13,7 +13,7 @@ from nominatim.errors import UsageError
 try:
     from osmium.replication.server import ReplicationServer
     from osmium import WriteHandler
-except ModuleNotFoundError as exc:
+except ImportError as exc:
     logging.getLogger().fatal("pyosmium not installed. Replication functions not available.\n"
                               "To install pyosmium via pip: pip3 install osmium")
     raise UsageError("replication tools not available") from exc