Skip to content

Commit

Permalink
fix backward compatibility issues with Python 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
lonvia committed Oct 25, 2024
1 parent 2c0f2e1 commit b9e4563
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build-api:
tests: mypy lint pytest bdd

mypy:
mypy --strict src
mypy --strict --python-version 3.8 src

pytest:
pytest test/python
Expand Down
10 changes: 5 additions & 5 deletions src/nominatim_api/server/falcon/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
Server implementation using the falcon webserver framework.
"""
from typing import Optional, Mapping, cast, Any, List
from typing import Optional, Mapping, Any, List
from pathlib import Path
import datetime as dt
import asyncio
Expand Down Expand Up @@ -72,11 +72,11 @@ def __init__(self, req: Request, resp: Response,


def get(self, name: str, default: Optional[str] = None) -> Optional[str]:
return cast(Optional[str], self.request.get_param(name, default=default))
return self.request.get_param(name, default=default)


def get_header(self, name: str, default: Optional[str] = None) -> Optional[str]:
return cast(Optional[str], self.request.get_header(name, default=default))
return self.request.get_header(name, default=default)


def error(self, msg: str, status: int = 400) -> HTTPNominatimError:
Expand All @@ -91,7 +91,7 @@ def create_response(self, status: int, output: str, num_results: int) -> None:


def base_uri(self) -> str:
return cast (str, self.request.forwarded_prefix)
return self.request.forwarded_prefix

def config(self) -> Configuration:
return self._config
Expand Down Expand Up @@ -183,7 +183,7 @@ def get_application(project_dir: Path,
app.add_error_handler(HTTPNominatimError, nominatim_error_handler)
app.add_error_handler(TimeoutError, timeout_error_handler)
# different from TimeoutError in Python <= 3.10
app.add_error_handler(asyncio.TimeoutError, timeout_error_handler)
app.add_error_handler(asyncio.TimeoutError, timeout_error_handler) # type: ignore[arg-type]

legacy_urls = api.config.get_bool('SERVE_LEGACY_URLS')
formatter = load_format_dispatcher('v1', project_dir)
Expand Down
8 changes: 4 additions & 4 deletions src/nominatim_api/v1/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ def extend_query_parts(queryparts: Dict[str, Any], details: Dict[str, Any],
"""
parsed = SearchDetails.from_kwargs(details)
if parsed.geometry_output != GeometryFormat.NONE:
if GeometryFormat.GEOJSON in parsed.geometry_output:
if GeometryFormat.GEOJSON & parsed.geometry_output:
queryparts['polygon_geojson'] = '1'
if GeometryFormat.KML in parsed.geometry_output:
if GeometryFormat.KML & parsed.geometry_output:
queryparts['polygon_kml'] = '1'
if GeometryFormat.SVG in parsed.geometry_output:
if GeometryFormat.SVG & parsed.geometry_output:
queryparts['polygon_svg'] = '1'
if GeometryFormat.TEXT in parsed.geometry_output:
if GeometryFormat.TEXT & parsed.geometry_output:
queryparts['polygon_text'] = '1'
if parsed.address_details:
queryparts['addressdetails'] = '1'
Expand Down

0 comments on commit b9e4563

Please sign in to comment.