searxng · dalf · Aug 11, 2021 · Aug 13, 2021
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - name: Checkout
       uses: actions/checkout@v2

diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh
@@ -146,4 +146,5 @@ unset MORTY_KEY
 
 # Start uwsgi
 printf 'Listen on %s\n' "${BIND_ADDRESS}"
-exec su-exec searx:searx uwsgi --master --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}"
+export SEARX_BIND_ADDRESS="${BIND_ADDRESS}"
+exec su-exec searx:searx python3 -m searx.webapp
diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,20 @@
 certifi==2021.5.30
 babel==2.9.1
-flask-babel==2.0.0
-flask==2.0.1
 jinja2==3.0.1
 lxml==4.6.3
 pygments==2.9.0
 python-dateutil==2.8.2
 pyyaml==5.4.1
+aiohttp[speedup]==3.7.4.post0
 httpx[http2]==0.17.1
 Brotli==1.0.9
-uvloop==0.16.0; python_version >= '3.7'
-uvloop==0.14.0; python_version < '3.7'
+uvloop==0.16.0
 httpx-socks[asyncio]==0.3.1
 langdetect==1.0.9
 setproctitle==1.2.2
+starlette==0.16.0
+starlette-i18n==1.0.0
+starlette-context==0.3.3
+python-multipart==0.0.5
+uvicorn[standard]==0.14.0
+gunicorn==20.1.0
diff --git a/searx/__init__.py b/searx/__init__.py
@@ -17,11 +17,13 @@
     settings = settings_set_defaults(settings)
 
 searx_debug = settings['general']['debug']
+logging.basicConfig()
 if searx_debug:
-    logging.basicConfig(level=logging.DEBUG)
+    logging.root.setLevel(logging.DEBUG)
+    for logger_name in ('hpack.hpack', 'hpack.table', 'multipart.multipart'):
+        logging.getLogger(logger_name).setLevel(logging.WARNING)
 else:
-    logging.basicConfig(level=logging.WARNING)
-
+    logging.root.setLevel(logging.WARNING)
 logger = logging.getLogger('searx')
 logger.info(settings_load_message)
 

diff --git a/searx/answerers/random/answerer.py b/searx/answerers/random/answerer.py
@@ -2,7 +2,7 @@
 import random
 import string
 import uuid
-from flask_babel import gettext
+from searx.i18n import gettext
 
 # required answerer attribute
 # specifies which search query keywords triggers this answerer

diff --git a/searx/answerers/statistics/answerer.py b/searx/answerers/statistics/answerer.py
@@ -1,7 +1,7 @@
 from functools import reduce
 from operator import mul
 
-from flask_babel import gettext
+from searx.i18n import gettext
 
 
 keywords = ('min',

diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
@@ -10,7 +10,7 @@
 from urllib.parse import urlencode
 from functools import partial
 
-from flask_babel import gettext
+from searx.i18n import gettext
 
 from searx.data import OSM_KEYS_TAGS, CURRENCIES
 from searx.utils import searx_useragent

diff --git a/searx/engines/pdbe.py b/searx/engines/pdbe.py
@@ -4,7 +4,7 @@
 """
 
 from json import loads
-from flask_babel import gettext
+from searx.i18n import gettext
 
 # about
 about = {

diff --git a/searx/engines/pubmed.py b/searx/engines/pubmed.py
@@ -3,10 +3,10 @@
  PubMed (Scholar publications)
 """
 
-from flask_babel import gettext
 from lxml import etree
 from datetime import datetime
 from urllib.parse import urlencode
+from searx.i18n import gettext
 from searx.network import get
 
 # about

diff --git a/searx/engines/qwant.py b/searx/engines/qwant.py
@@ -29,8 +29,8 @@
 )
 from json import loads
 from urllib.parse import urlencode
-from flask_babel import gettext
 
+from searx.i18n import gettext
 from searx.utils import match_language
 from searx.exceptions import SearxEngineAPIException
 from searx.network import raise_for_httperror

diff --git a/searx/flaskfix.py b/searx/flaskfix.py
diff --git a/searx/i18n.py b/searx/i18n.py
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# lint: pylint
+# pylint: disable=missing-module-docstring,missing-function-docstring
+
+import babel
+import babel.numbers
+import babel.dates
+import babel.support
+
+from starlette_i18n import (
+    i18n,
+    load_gettext_translations,
+)
+from starlette_i18n import gettext_lazy as gettext
+
+__all__ = (
+    'gettext',
+    'format_decimal',
+    'format_date',
+    'initialize_i18n'
+)
+
+
+def format_decimal(number, format=None):  # pylint: disable=redefined-builtin
+    locale = i18n.get_locale()
+    return babel.numbers.format_decimal(number, format=format, locale=locale)
+
+
+def format_date(date=None, format='medium', rebase=False):  # pylint: disable=redefined-builtin
+    if rebase:
+        raise ValueError('rebase=True not implemented')
+    locale = i18n.get_locale()
+    if format in ('full', 'long', 'medium', 'short'):
+        format = locale.date_formats[format]
+    pattern = babel.dates.parse_pattern(format)
+    return pattern.apply(date, locale)
+
+
+def monkeypatch():
+    old_i18n_Locale_parse = i18n.Locale.parse
+    def i18n_Locale_parse(identifier, sep='_', resolve_likely_subtags=True):
+        if identifier == 'oc':
+            identifier = 'fr'
+        return old_i18n_Locale_parse(identifier, sep, resolve_likely_subtags)
+    setattr(i18n.Locale, 'parse', i18n_Locale_parse)
+
+
+def initialize_i18n(translations_path):
+    monkeypatch()
+    load_gettext_translations(directory=translations_path, domain="messages")