X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fc03c0266a908e3aaec11530aa7f1d0af967aa2e..f5e52e748f0a4275e3238e51c47de2ddccfea0ff:/nominatim/tools/exec_utils.py diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index 6b080792..610e2182 100644 --- a/nominatim/tools/exec_utils.py +++ b/nominatim/tools/exec_utils.py @@ -7,7 +7,7 @@ """ Helper functions for executing external programs. """ -from typing import Any, Union, Optional, Mapping +from typing import Any, Union, Optional, Mapping, IO from pathlib import Path import logging import subprocess @@ -47,8 +47,8 @@ def run_legacy_script(script: StrPath, *args: Union[int, str], def run_api_script(endpoint: str, project_dir: Path, extra_env: Optional[Mapping[str, str]] = None, - phpcgi_bin: Optional[str] = None, - params: Optional[Mapping[str, str]] = None) -> int: + phpcgi_bin: Optional[Path] = None, + params: Optional[Mapping[str, Any]] = None) -> int: """ Execute a Nominatim API function. The function needs a project directory that contains the website @@ -160,7 +160,8 @@ def get_url(url: str) -> str: headers = {"User-Agent": f"Nominatim/{version_str()}"} try: - with urlrequest.urlopen(urlrequest.Request(url, headers=headers)) as response: + request = urlrequest.Request(url, headers=headers) + with urlrequest.urlopen(request) as response: # type: IO[bytes] return response.read().decode('utf-8') except Exception: LOG.fatal('Failed to load URL: %s', url)