Browse Source

Drop typing-extensions dependency (#3265)

Co-authored-by: Markus Heiser <markus.heiser@darmarit.de>
Alexandre Flament 1 year ago
parent
commit
38fdd2288a
3 changed files with 5 additions and 8 deletions
  1. 0 1
      requirements.txt
  2. 4 5
      searx/enginelib/traits.py
  3. 1 2
      searx/search/checker/background.py

+ 0 - 1
requirements.txt

@@ -14,6 +14,5 @@ httpx-socks[asyncio]==0.7.7
 setproctitle==1.3.3
 redis==5.0.2
 markdown-it-py==3.0.0
-typing_extensions==4.9.0
 fasttext-predict==0.9.2.2
 pytomlpp==1.0.13

+ 4 - 5
searx/enginelib/traits.py

@@ -14,8 +14,7 @@ from __future__ import annotations
 import json
 import dataclasses
 import types
-from typing import Dict, Iterable, Union, Callable, Optional, TYPE_CHECKING
-from typing_extensions import Literal, Self
+from typing import Dict, Literal, Iterable, Union, Callable, Optional, TYPE_CHECKING
 
 from searx import locales
 from searx.data import data_dir, ENGINE_TRAITS
@@ -136,7 +135,7 @@ class EngineTraits:
         return EngineTraits(**dataclasses.asdict(self))
 
     @classmethod
-    def fetch_traits(cls, engine: Engine) -> Union[Self, None]:
+    def fetch_traits(cls, engine: Engine) -> Union['EngineTraits', None]:
         """Call a function ``fetch_traits(engine_traits)`` from engines namespace to fetch
         and set properties from the origin engine in the object ``engine_traits``.  If
         function does not exists, ``None`` is returned.
@@ -204,7 +203,7 @@ class EngineTraitsMap(Dict[str, EngineTraits]):
             json.dump(self, f, indent=2, sort_keys=True, cls=EngineTraitsEncoder)
 
     @classmethod
-    def from_data(cls) -> Self:
+    def from_data(cls) -> 'EngineTraitsMap':
         """Instantiate :class:`EngineTraitsMap` object from :py:obj:`ENGINE_TRAITS`"""
         obj = cls()
         for k, v in ENGINE_TRAITS.items():
@@ -212,7 +211,7 @@ class EngineTraitsMap(Dict[str, EngineTraits]):
         return obj
 
     @classmethod
-    def fetch_traits(cls, log: Callable) -> Self:
+    def fetch_traits(cls, log: Callable) -> 'EngineTraitsMap':
         from searx import engines  # pylint: disable=cyclic-import, import-outside-toplevel
 
         names = list(engines.engines)

+ 1 - 2
searx/search/checker/background.py

@@ -8,8 +8,7 @@ import time
 import threading
 import os
 import signal
-from typing import Dict, Union, List, Any, Tuple, Optional
-from typing_extensions import TypedDict, Literal
+from typing import Any, Dict, List, Literal, Optional, Tuple, TypedDict, Union
 
 import redis.exceptions