1797840 · searx · git.iko.soy

.pylintrc+1−1

compare with master

unifiedsplit

@@ -59,7 +59,7 @@ confidence=

59# --enable=similarities". If you want to run only the classes checker, but have

60# no Warning level messages displayed, use"--disable=all --enable=classes

61# --disable=W"

62−disable=bad-whitespace, duplicate-code

62+disable=bad-whitespace, duplicate-code, consider-using-f-string

63

64# Enable the message, report, category or checker with the given id(s). You can

65# either give multiple identifier separated by comma (,) or put this option

requirements-dev.txt+1−1

@@ -2,7 +2,7 @@ mock==4.0.3

2nose2[coverage_plugin]==0.10.0

3cov-core==1.15.0

4pycodestyle==2.7.0

5−pylint==2.10.2

5+pylint==2.12.2

6splinter==0.15.0

7transifex-client==0.14.3

8selenium==3.141.0

searx/engines/__init__.py+1−1

@@ -275,7 +275,7 @@ def get_engines_stats(preferences):

275

276

277def load_engines(engine_list):

278− global engines, engine_shortcuts

278+ global engines, engine_shortcuts # pylint: disable=global-variable-not-assigned

279 engines.clear()

280 engine_shortcuts.clear()

281 for engine_data in engine_list:

searx/engines/command.py+1−1

@@ -35,7 +35,7 @@ def init(engine_settings):

35 if 'command' not in engine_settings:

36 raise ValueError('engine command : missing configuration key: command')

37

38− global command, working_dir, result_template, delimiter, parse_regex, timeout, environment_variables

38+ global command, working_dir, delimiter, parse_regex, environment_variables

39

40 command = engine_settings['command']

41

searx/engines/yggtorrent.py+1−1

@@ -37,7 +37,7 @@ cookies = dict()

37

38

39def init(engine_settings=None):

40− global cookies

40+ global cookies # pylint: disable=global-variable-not-assigned

41 # initial cookies

42 resp = http_get(url, follow_redirects=False)

43 if resp.ok:

tests/unit/test_external_bangs.py−6

@@ -72,31 +72,26 @@ class TestResolveBangDefinition(SearxTestCase):

72class TestGetBangDefinitionAndAutocomplete(SearxTestCase):

73

74 def test_found(self):

75− global TEST_DB

76 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('exam', external_bangs_db=TEST_DB)

75 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('exam', external_bangs_db=TEST_DB)

77 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['*'])

76 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['*'])

78 self.assertEqual(new_autocomplete, ['example'])

77 self.assertEqual(new_autocomplete, ['example'])

79

78

80 def test_found_optimized(self):

79 def test_found_optimized(self):

81− global TEST_DB

82 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('example', external_bangs_db=TEST_DB)

80 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('example', external_bangs_db=TEST_DB)

83 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['ple'])

81 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['ple'])

84 self.assertEqual(new_autocomplete, [])

82 self.assertEqual(new_autocomplete, [])

85

83

86 def test_partial(self):

84 def test_partial(self):

87− global TEST_DB

88 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('examp', external_bangs_db=TEST_DB)

85 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('examp', external_bangs_db=TEST_DB)

89 self.assertEqual(bang_definition, None)

86 self.assertEqual(bang_definition, None)

90 self.assertEqual(new_autocomplete, ['example'])

87 self.assertEqual(new_autocomplete, ['example'])

91

88

92 def test_partial2(self):

89 def test_partial2(self):

93− global TEST_DB

94 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('sea', external_bangs_db=TEST_DB)

90 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('sea', external_bangs_db=TEST_DB)

95 self.assertEqual(bang_definition, TEST_DB['trie']['sea']['*'])

91 self.assertEqual(bang_definition, TEST_DB['trie']['sea']['*'])

96 self.assertEqual(new_autocomplete, ['search', 'searching', 'seascapes', 'season'])

92 self.assertEqual(new_autocomplete, ['search', 'searching', 'seascapes', 'season'])

97

93

98 def test_error(self):

94 def test_error(self):

99− global TEST_DB

100 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('error', external_bangs_db=TEST_DB)

95 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('error', external_bangs_db=TEST_DB)

101 self.assertEqual(bang_definition, None)

96 self.assertEqual(bang_definition, None)

102 self.assertEqual(new_autocomplete, [])

97 self.assertEqual(new_autocomplete, [])

@@ -114,7 +109,6 @@ class TestExternalBangJson(SearxTestCase):

114 self.assertEqual(result, None)

109 self.assertEqual(result, None)

115

110

116 def test_get_bang_url(self):

111 def test_get_bang_url(self):

117− global TEST_DB

118 url = get_bang_url(SearchQuery('test', engineref_list=[], external_bang='example'), external_bangs_db=TEST_DB)

112 url = get_bang_url(SearchQuery('test', engineref_list=[], external_bang='example'), external_bangs_db=TEST_DB)

119 self.assertEqual(url, 'https://example.com/test')

113 self.assertEqual(url, 'https://example.com/test')

120

114