4f18fae · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #2288 from dalf/lint

[mod] remove unused import

commit4f18faebe17805ab89ec74e76d722fa64fc2418c authorAlexandre Flament <alex@al-f.net> dateSat 14 Nov 2020, 14:24 (6 years ago) parent6489a56 3038052

31 files changed+24−52

compare with master

unifiedsplit

searx/engines/acgsou.py+1−1

@@ -11,7 +11,7 @@

1111

1212from urllib.parse import urlencode

1313from lxml import html

14−from searx.utils import extract_text, get_torrent_size, int_or_zero

14+from searx.utils import extract_text, get_torrent_size

1515

1616# engine dependent config

1717categories = ['files', 'images', 'videos', 'music']

searx/engines/arxiv.py−1

@@ -11,7 +11,6 @@

1111 More info on api: https://arxiv.org/help/api/user-manual

1212"""

1313

14−from urllib.parse import urlencode

1514from lxml import html

1615from datetime import datetime

1716

searx/engines/bing.py+2−3

@@ -16,8 +16,8 @@

1616import re

1717from urllib.parse import urlencode

1818from lxml import html

19−from searx import logger, utils

20−from searx.utils import extract_text, match_language, gen_useragent, eval_xpath

19+from searx import logger

20+from searx.utils import eval_xpath, extract_text, match_language

2121

2222logger = logger.getChild('bing engine')

2323

@@ -98,7 +98,6 @@ def response(resp):

9898 result_len = int(result_len_container)

9999 except Exception as e:

100100 logger.debug('result error :\n%s', e)

101− pass

102101

103102 if result_len and _get_offset_from_pageno(resp.search_params.get("pageno", 0)) > result_len:

104103 return []

searx/engines/bing_images.py+2−2

@@ -15,10 +15,10 @@

1515from urllib.parse import urlencode

1616from lxml import html

1717from json import loads

18−import re

1918from searx.utils import match_language

2019

21−from searx.engines.bing import _fetch_supported_languages, supported_languages_url, language_aliases

20+from searx.engines.bing import language_aliases

21+from searx.engines.bing import _fetch_supported_languages, supported_languages_url # NOQA

2222

2323# engine dependent config

2424categories = ['images']

searx/engines/bing_news.py+2−1

@@ -16,7 +16,8 @@ from dateutil import parser

1616from urllib.parse import urlencode, urlparse, parse_qsl

1717from lxml import etree

1818from searx.utils import list_get, match_language

19−from searx.engines.bing import _fetch_supported_languages, supported_languages_url, language_aliases

19+from searx.engines.bing import language_aliases

20+from searx.engines.bing import _fetch_supported_languages, supported_languages_url # NOQA

2021

2122# engine dependent config

2223categories = ['news']

searx/engines/bing_videos.py+2−1

@@ -15,7 +15,8 @@ from lxml import html

1515from urllib.parse import urlencode

1616from searx.utils import match_language

1717

18−from searx.engines.bing import _fetch_supported_languages, supported_languages_url, language_aliases

18+from searx.engines.bing import language_aliases

19+from searx.engines.bing import _fetch_supported_languages, supported_languages_url # NOQA

1920

2021categories = ['videos']

2122paging = True

searx/engines/btdigg.py−1

@@ -11,7 +11,6 @@

1111"""

1212

1313from lxml import html

14−from operator import itemgetter

1514from urllib.parse import quote, urljoin

1615from searx.utils import extract_text, get_torrent_size

1716

searx/engines/command.py−1

@@ -18,7 +18,6 @@ import re

1818from os.path import expanduser, isabs, realpath, commonprefix

1919from shlex import split as shlex_split

2020from subprocess import Popen, PIPE

21−from time import time

2221from threading import Thread

2322

2423from searx import logger

searx/engines/currency_convert.py+1−4

@@ -1,10 +1,7 @@

11import json

22import re

33import unicodedata

4−

5−from datetime import datetime

6−

7−from searx.data import CURRENCIES

4+from searx.data import CURRENCIES # NOQA

107categories = []

searx/engines/deviantart.py−1

@@ -15,7 +15,6 @@

1515from lxml import html

1616import re

1717from urllib.parse import urlencode

18−from searx.utils import extract_text

1918

2019

2120# engine dependent config

searx/engines/digg.py−2

@@ -12,10 +12,8 @@

1212

1313import random

1414import string

15−from dateutil import parser

1615from json import loads

1716from urllib.parse import urlencode

18−from lxml import html

1917from datetime import datetime

2018

2119# engine dependent config

searx/engines/duckduckgo.py−2

@@ -15,8 +15,6 @@

1515

1616from lxml.html import fromstring

1717from json import loads

18−from urllib.parse import urlencode

19−from searx.poolrequests import get

2018from searx.utils import extract_text, match_language, eval_xpath

2119

2220# engine dependent config

searx/engines/duckduckgo_definitions.py+2−2

@@ -15,11 +15,11 @@ from lxml import html

1515

1616from searx import logger

1717from searx.data import WIKIDATA_UNITS

18−from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url, language_aliases

18+from searx.engines.duckduckgo import language_aliases

19+from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url # NOQA

1920from searx.utils import extract_text, html_to_text, match_language, get_string_replaces_function

2021from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom

2122

22−

2323logger = logger.getChild('duckduckgo_definitions')

2424

2525URL = 'https://api.duckduckgo.com/'\

searx/engines/duckduckgo_images.py+2−5

@@ -15,12 +15,9 @@

1515

1616from json import loads

1717from urllib.parse import urlencode

18−from searx.engines.duckduckgo import (

19− _fetch_supported_languages, supported_languages_url,

20− get_region_code, language_aliases

21−)

18+from searx.engines.duckduckgo import get_region_code

19+from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url # NOQA

2220from searx.poolrequests import get

23−from searx.utils import extract_text

2421

2522# engine dependent config

2623categories = ['images']

searx/engines/duden.py−1

@@ -60,7 +60,6 @@ def response(resp):

6060

6161 except:

6262 logger.debug("Couldn't read number of results.")

63− pass

6463

6564 for result in eval_xpath(dom, '//section[not(contains(@class, "essay"))]'):

6665 try:

searx/engines/elasticsearch.py−3

@@ -1,8 +1,5 @@

11from json import loads, dumps

2−from lxml import html

3−from urllib.parse import quote, urljoin

42from requests.auth import HTTPBasicAuth

5−from searx.utils import extract_text, get_torrent_size

85base_url = 'http://localhost:9200'

searx/engines/google_images.py+1−4

@@ -29,12 +29,9 @@ from lxml import html

2929from flask_babel import gettext

3030from searx import logger

3131from searx.utils import extract_text, eval_xpath

32+from searx.engines.google import _fetch_supported_languages, supported_languages_url # NOQA

3233

3334# pylint: disable=unused-import

34−from searx.engines.google import (

35− supported_languages_url,

36− _fetch_supported_languages,

37−)

3835# pylint: enable=unused-import

3936

4037from searx.engines.google import (

searx/engines/google_news.py+1−1

@@ -12,8 +12,8 @@

1212

1313from urllib.parse import urlencode

1414from lxml import html

15−from searx.engines.google import _fetch_supported_languages, supported_languages_url

1615from searx.utils import match_language

16+from searx.engines.google import _fetch_supported_languages, supported_languages_url # NOQA

1717

1818# search-url

1919categories = ['news']

searx/engines/google_videos.py−1

@@ -11,7 +11,6 @@

1111"""

1212

1313from datetime import date, timedelta

14−from json import loads

1514from urllib.parse import urlencode

1615from lxml import html

1716from searx.utils import extract_text

searx/engines/piratebay.py+2−2

@@ -12,8 +12,8 @@ from json import loads

1212from datetime import datetime

1313from operator import itemgetter

1414

15−from urllib.parse import quote, urljoin

16−from searx.utils import extract_text, get_torrent_size

15+from urllib.parse import quote

16+from searx.utils import get_torrent_size

1717

1818# engine dependent config

1919categories = ["videos", "music", "files"]

searx/engines/soundcloud.py−1

@@ -14,7 +14,6 @@ import re

1414from json import loads

1515from lxml import html

1616from dateutil import parser

17−from io import StringIO

1817from urllib.parse import quote_plus, urlencode

1918from searx import logger

2019from searx.poolrequests import get as http_get

searx/engines/startpage.py−1

@@ -17,7 +17,6 @@ import re

1717from unicodedata import normalize, combining

1818from babel import Locale

1919from babel.localedata import locale_identifiers

20−from searx.languages import language_codes

2120from searx.utils import extract_text, eval_xpath, match_language

2221

2322# engine dependent config

searx/engines/wikidata.py+1−1

@@ -21,9 +21,9 @@ from babel.dates import format_datetime, format_date, format_time, get_datetime_

2121from searx import logger

2222from searx.data import WIKIDATA_UNITS

2323from searx.poolrequests import post, get

24−from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url

2524from searx.utils import match_language, searx_useragent, get_string_replaces_function

2625from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom

26+from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url # NOQA

2727

2828logger = logger.getChild('wikidata')

2929

searx/engines/yahoo_news.py+2−3

@@ -13,9 +13,8 @@ import re

1313from datetime import datetime, timedelta

1414from urllib.parse import urlencode

1515from lxml import html

16−from searx.engines.yahoo import (

17− parse_url, _fetch_supported_languages, supported_languages_url, language_aliases

18−)

16+from searx.engines.yahoo import parse_url, language_aliases

17+from searx.engines.yahoo import _fetch_supported_languages, supported_languages_url # NOQA

1918from dateutil import parser

2019from searx.utils import extract_text, extract_url, match_language

2120

searx/engines/youtube_noapi.py−1

@@ -11,7 +11,6 @@

1111from functools import reduce

1212from json import loads

1313from urllib.parse import quote_plus

14−from searx.utils import extract_text, list_get

1514

1615# engine dependent config

1716categories = ['videos', 'music']

searx/plugins/__init__.py−1

@@ -20,7 +20,6 @@ from importlib import import_module

2020from os import listdir, makedirs, remove, stat, utime

2121from os.path import abspath, basename, dirname, exists, join

2222from shutil import copyfile

23−from traceback import print_exc

2423

2524from searx import logger, settings, static_path

2625

searx/results.py−1

@@ -1,5 +1,4 @@

11import re

2−from collections import defaultdict

32from operator import itemgetter

43from threading import RLock

54from urllib.parse import urlparse, unquote

searx/utils.py+1−1

@@ -7,7 +7,7 @@ from numbers import Number

77from os.path import splitext, join

88from random import choice

99from html.parser import HTMLParser

10−from urllib.parse import urljoin, urlparse, unquote

10+from urllib.parse import urljoin, urlparse

1111

1212from lxml import html

1313from lxml.etree import XPath, _ElementStringResult, _ElementUnicodeResult

searx/webapp.py+1−1

@@ -40,7 +40,7 @@ from datetime import datetime, timedelta

4040from time import time

4141from html import escape

4242from io import StringIO

43−from urllib.parse import urlencode, urlparse, urljoin, urlsplit

43+from urllib.parse import urlencode, urljoin, urlparse

4444

4545from pygments import highlight

4646from pygments.lexers import get_lexer_by_name

tests/unit/engines/test_command.py−1

@@ -14,7 +14,6 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1414

1515'''

1616

17−from sys import version_info

1817

1918from searx.engines import command as command_engine

2019from searx.testing import SearxTestCase

tests/unit/test_webadapter.py+1−1

@@ -5,7 +5,7 @@ from searx.preferences import Preferences

55from searx.engines import engines

77import searx.search

8−from searx.search import EngineRef, SearchQuery

8+from searx.search import EngineRef

99from searx.webadapter import validate_engineref_list

1010

1111