make formatting module non-static

[nominatim.git] / src / nominatim_api / server / falcon / server.py

diff --git a/src/nominatim_api/server/falcon/server.py b/src/nominatim_api/server/falcon/server.py
index 851b096437d4d5730ed2e7c4f5da9f60d1caf8c6..91fc268eb9d80365c58d8a48896a5015b319a478 100644 (file)
--- a/src/nominatim_api/server/falcon/server.py
+++ b/src/nominatim_api/server/falcon/server.py
@@ -14,10 +14,13 @@ import asyncio
 
 from falcon.asgi import App, Request, Response
 
 
 from falcon.asgi import App, Request, Response
 

-from nominatim_core.config import Configuration
+from ...config import Configuration

 from ...core import NominatimAPIAsync
 from ... import v1 as api_impl
 from ...core import NominatimAPIAsync
 from ... import v1 as api_impl

+from ...result_formatting import FormatDispatcher
+from ...v1.format import dispatch as formatting

 from ... import logging as loglib
 from ... import logging as loglib

+from ..asgi_adaptor import ASGIAdaptor, EndpointFunc

 
 class HTTPNominatimError(Exception):
     """ A special exception class for errors raised during processing.
 
 class HTTPNominatimError(Exception):
     """ A special exception class for errors raised during processing.


@@ -57,12 +60,11 @@ async def timeout_error_handler(req: Request, resp: Response, #pylint: disable=u
         resp.content_type = 'text/plain; charset=utf-8'
 
 
         resp.content_type = 'text/plain; charset=utf-8'
 
 

-class ParamWrapper(api_impl.ASGIAdaptor):
+class ParamWrapper(ASGIAdaptor):

     """ Adaptor class for server glue to Falcon framework.
     """
 
     """ Adaptor class for server glue to Falcon framework.
     """
 

-    def __init__(self, req: Request, resp: Response,
-                 config: Configuration) -> None:
+    def __init__(self, req: Request, resp: Response, config: Configuration) -> None:

         self.request = req
         self.response = resp
         self._config = config
         self.request = req
         self.response = resp
         self._config = config


@@ -93,12 +95,15 @@ class ParamWrapper(api_impl.ASGIAdaptor):
     def config(self) -> Configuration:
         return self._config
 
     def config(self) -> Configuration:
         return self._config
 

+    def formatting(self) -> FormatDispatcher:
+        return formatting
+

 
 class EndpointWrapper:
     """ Converter for server glue endpoint functions to Falcon request handlers.
     """
 
 
 class EndpointWrapper:
     """ Converter for server glue endpoint functions to Falcon request handlers.
     """
 

-    def __init__(self, name: str, func: api_impl.EndpointFunc, api: NominatimAPIAsync) -> None:
+    def __init__(self, name: str, func: EndpointFunc, api: NominatimAPIAsync) -> None:

         self.name = name
         self.func = func
         self.api = api
         self.name = name
         self.func = func
         self.api = api