From 179784068f09162a02f28faa14a74390f15469a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Sat, 15 Jan 2022 20:23:09 +0100 Subject: [PATCH] Bump pylint from 2.10.2 to 2.12.2 (#3124) Bumps [pylint](https://github.com/PyCQA/pylint) from 2.10.2 to 2.12.2. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/v2.10.2...v2.12.2) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pylintrc | 2 +- requirements-dev.txt | 2 +- searx/engines/__init__.py | 2 +- searx/engines/command.py | 2 +- searx/engines/yggtorrent.py | 2 +- tests/unit/test_external_bangs.py | 6 ------ 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.pylintrc b/.pylintrc index eb6d500b..5d448343 100644 --- a/.pylintrc +++ b/.pylintrc @@ -59,7 +59,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=bad-whitespace, duplicate-code +disable=bad-whitespace, duplicate-code, consider-using-f-string # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option diff --git a/requirements-dev.txt b/requirements-dev.txt index 6f2cf256..31fd89bd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ mock==4.0.3 nose2[coverage_plugin]==0.10.0 cov-core==1.15.0 pycodestyle==2.7.0 -pylint==2.10.2 +pylint==2.12.2 splinter==0.15.0 transifex-client==0.14.3 selenium==3.141.0 diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index 20fa5206..351f6a4f 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -275,7 +275,7 @@ def get_engines_stats(preferences): def load_engines(engine_list): - global engines, engine_shortcuts + global engines, engine_shortcuts # pylint: disable=global-variable-not-assigned engines.clear() engine_shortcuts.clear() for engine_data in engine_list: diff --git a/searx/engines/command.py b/searx/engines/command.py index 33270d24..aca379c6 100644 --- a/searx/engines/command.py +++ b/searx/engines/command.py @@ -35,7 +35,7 @@ def init(engine_settings): if 'command' not in engine_settings: raise ValueError('engine command : missing configuration key: command') - global command, working_dir, result_template, delimiter, parse_regex, timeout, environment_variables + global command, working_dir, delimiter, parse_regex, environment_variables command = engine_settings['command'] diff --git a/searx/engines/yggtorrent.py b/searx/engines/yggtorrent.py index c2789a6a..79ebebd3 100644 --- a/searx/engines/yggtorrent.py +++ b/searx/engines/yggtorrent.py @@ -37,7 +37,7 @@ cookies = dict() def init(engine_settings=None): - global cookies + global cookies # pylint: disable=global-variable-not-assigned # initial cookies resp = http_get(url, follow_redirects=False) if resp.ok: diff --git a/tests/unit/test_external_bangs.py b/tests/unit/test_external_bangs.py index 6a968678..541dfeff 100644 --- a/tests/unit/test_external_bangs.py +++ b/tests/unit/test_external_bangs.py @@ -72,31 +72,26 @@ class TestResolveBangDefinition(SearxTestCase): class TestGetBangDefinitionAndAutocomplete(SearxTestCase): def test_found(self): - global TEST_DB bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('exam', external_bangs_db=TEST_DB) self.assertEqual(bang_definition, TEST_DB['trie']['exam']['*']) self.assertEqual(new_autocomplete, ['example']) def test_found_optimized(self): - global TEST_DB bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('example', external_bangs_db=TEST_DB) self.assertEqual(bang_definition, TEST_DB['trie']['exam']['ple']) self.assertEqual(new_autocomplete, []) def test_partial(self): - global TEST_DB bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('examp', external_bangs_db=TEST_DB) self.assertEqual(bang_definition, None) self.assertEqual(new_autocomplete, ['example']) def test_partial2(self): - global TEST_DB bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('sea', external_bangs_db=TEST_DB) self.assertEqual(bang_definition, TEST_DB['trie']['sea']['*']) self.assertEqual(new_autocomplete, ['search', 'searching', 'seascapes', 'season']) def test_error(self): - global TEST_DB bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('error', external_bangs_db=TEST_DB) self.assertEqual(bang_definition, None) self.assertEqual(new_autocomplete, []) @@ -114,7 +109,6 @@ class TestExternalBangJson(SearxTestCase): self.assertEqual(result, None) def test_get_bang_url(self): - global TEST_DB url = get_bang_url(SearchQuery('test', engineref_list=[], external_bang='example'), external_bangs_db=TEST_DB) self.assertEqual(url, 'https://example.com/test')