Merge pull request #3525 from lonvia/project-dir-less-library

[nominatim.git] / src / nominatim_db / tools / replication.py

diff --git a/src/nominatim_db/tools/replication.py b/src/nominatim_db/tools/replication.py
index bf1189df032a85a40a985c20e783edfd74410e29..eb031f390221c4dcea846f9d12999995ddb38011 100644 (file)
--- a/src/nominatim_db/tools/replication.py
+++ b/src/nominatim_db/tools/replication.py
@@ -16,20 +16,19 @@ import time
 import types
 import urllib.request as urlrequest
 
 import types
 import urllib.request as urlrequest
 

-import requests
-

 from ..errors import UsageError
 from ..db import status
 from ..errors import UsageError
 from ..db import status

-from ..db.connection import Connection, connect
+from ..db.connection import Connection, connect, server_version_tuple

 from .exec_utils import run_osm2pgsql
 
 try:
     from osmium.replication.server import ReplicationServer
     from osmium import WriteHandler
     from osmium import version as pyo_version
 from .exec_utils import run_osm2pgsql
 
 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"
     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()
     raise UsageError("replication tools not available") from exc
 
 LOG = logging.getLogger()


@@ -155,7 +154,7 @@ def run_osm2pgsql_updates(conn: Connection, options: MutableMapping[str, Any]) -
 
     # Consume updates with osm2pgsql.
     options['append'] = True
 
     # Consume updates with osm2pgsql.
     options['append'] = True

-    options['disable_jit'] = conn.server_version_tuple() >= (11, 0)
+    options['disable_jit'] = server_version_tuple(conn) >= (11, 0)

     run_osm2pgsql(options)
 
     # Handle deletions
     run_osm2pgsql(options)
 
     # Handle deletions