From: Sarah Hoffmann Date: Tue, 20 Aug 2024 07:03:52 +0000 (+0200) Subject: Merge pull request #3520 from lonvia/restrict-interpolation-range X-Git-Tag: deploy~1^2 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/f535340d5af0b59c1bbdfde885b62dd483a9e38e?hp=0efdd1b9a662ac976a268c23c19c523095122524 Merge pull request #3520 from lonvia/restrict-interpolation-range Restrict interpolation housenumbers to 0-999999 --- diff --git a/src/nominatim_db/tools/replication.py b/src/nominatim_db/tools/replication.py index 2b1d444f..eb031f39 100644 --- a/src/nominatim_db/tools/replication.py +++ b/src/nominatim_db/tools/replication.py @@ -16,8 +16,6 @@ import time import types import urllib.request as urlrequest -import requests - from ..errors import UsageError from ..db import status from ..db.connection import Connection, connect, server_version_tuple @@ -27,9 +25,10 @@ try: from osmium.replication.server import ReplicationServer from osmium import WriteHandler from osmium import version as pyo_version -except ImportError as exc: + import requests +except ModuleNotFoundError as exc: logging.getLogger().critical("pyosmium not installed. Replication functions not available.\n" - "To install pyosmium via pip: pip3 install osmium") + "To install pyosmium via pip: pip install osmium") raise UsageError("replication tools not available") from exc LOG = logging.getLogger()