diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2021-08-31 09:08:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 09:08:59 +0000 |
| commit | 1e942435be5f8dbf30be7296466ca674b69b7c70 (patch) | |
| tree | 423e1a594ac884970a9d68c3520a2d9052ed11a8 | |
| parent | 449458922722c1679de2b6dce902440e94a6b383 (diff) | |
| parent | a1adc46fc886aeb41be152583dc4bbfdae7706d4 (diff) | |
Merge pull request #273 from searxng/dependabot/pip/master/pylint-2.10.2
Bump pylint from 2.9.6 to 2.10.2
| -rw-r--r-- | requirements-dev.txt | 2 | ||||
| -rw-r--r-- | searx/engines/google_images.py | 2 | ||||
| -rw-r--r-- | searx/engines/google_videos.py | 2 | ||||
| -rw-r--r-- | searx/engines/meilisearch.py | 2 | ||||
| -rw-r--r-- | searx/network/__init__.py | 2 | ||||
| -rw-r--r-- | searx/preferences.py | 6 | ||||
| -rw-r--r-- | searx/version.py | 4 | ||||
| -rwxr-xr-x | searx_extra/update/update_external_bangs.py | 2 | ||||
| -rwxr-xr-x | searx_extra/update/update_osm_keys_tags.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_utils.py | 4 |
10 files changed, 14 insertions, 14 deletions
diff --git a/requirements-dev.txt b/requirements-dev.txt index 84be43052..42bd11726 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.9.6 +pylint==2.10.2 splinter==0.15.0 transifex-client==0.14.3 selenium==3.141.0 diff --git a/searx/engines/google_images.py b/searx/engines/google_images.py index edfc3df9a..f4fbbaa42 100644 --- a/searx/engines/google_images.py +++ b/searx/engines/google_images.py @@ -66,7 +66,7 @@ filter_mapping = { def scrap_out_thumbs(dom): """Scrap out thumbnail data from <script> tags. """ - ret_val = dict() + ret_val = {} for script in eval_xpath(dom, '//script[contains(., "_setImgSrc(")]'): _script = script.text # _setImgSrc('0','data:image\/jpeg;base64,\/9j\/4AAQSkZJR ....'); diff --git a/searx/engines/google_videos.py b/searx/engines/google_videos.py index 3747e85a5..3990d5b32 100644 --- a/searx/engines/google_videos.py +++ b/searx/engines/google_videos.py @@ -80,7 +80,7 @@ def _re(regexpr): def scrap_out_thumbs(dom): """Scrap out thumbnail data from <script> tags. """ - ret_val = dict() + ret_val = {} thumb_name = 'vidthumb' for script in eval_xpath_list(dom, '//script[contains(., "_setImagesSrc")]'): diff --git a/searx/engines/meilisearch.py b/searx/engines/meilisearch.py index 86cd7512c..d0d304e2a 100644 --- a/searx/engines/meilisearch.py +++ b/searx/engines/meilisearch.py @@ -12,7 +12,7 @@ from json import loads, dumps base_url = 'http://localhost:7700' index = '' auth_key = '' -facet_filters = list() +facet_filters = [] _search_url = '' result_template = 'key-value.html' categories = ['general'] diff --git a/searx/network/__init__.py b/searx/network/__init__.py index 9e80a30a1..3dc99da48 100644 --- a/searx/network/__init__.py +++ b/searx/network/__init__.py @@ -172,7 +172,7 @@ async def stream_chunk_to_queue(network, queue, method, url, **kwargs): async for chunk in response.aiter_raw(65536): if len(chunk) > 0: queue.put(chunk) - except httpx.ResponseClosed as e: + except httpx.ResponseClosed: # the response was closed pass except (httpx.HTTPError, OSError, h2.exceptions.ProtocolError) as e: diff --git a/searx/preferences.py b/searx/preferences.py index 69832c052..c19a11f4b 100644 --- a/searx/preferences.py +++ b/searx/preferences.py @@ -285,7 +285,7 @@ class EnginesSetting(SwitchableSetting): transformed_choices = [] for engine_name, engine in self.choices.items(): # pylint: disable=no-member,access-member-before-definition for category in engine.categories: - transformed_choice = dict() + transformed_choice = {} transformed_choice['default_on'] = not engine.disabled transformed_choice['id'] = '{}__{}'.format(engine_name, category) transformed_choices.append(transformed_choice) @@ -296,7 +296,7 @@ class EnginesSetting(SwitchableSetting): def transform_values(self, values): if len(values) == 1 and next(iter(values)) == '': - return list() + return [] transformed_values = [] for value in values: engine, category = value.split('__') @@ -311,7 +311,7 @@ class PluginsSetting(SwitchableSetting): super()._post_init() transformed_choices = [] for plugin in self.choices: # pylint: disable=access-member-before-definition - transformed_choice = dict() + transformed_choice = {} transformed_choice['default_on'] = plugin.default_on transformed_choice['id'] = plugin.id transformed_choices.append(transformed_choice) diff --git a/searx/version.py b/searx/version.py index 34c37bd22..daada6020 100644 --- a/searx/version.py +++ b/searx/version.py @@ -126,8 +126,8 @@ GIT_URL = "{GIT_URL}" GIT_BRANCH = "{GIT_BRANCH}" """ with open( - os.path.join(os.path.dirname(__file__), "version_frozen.py"), "w" - ) as f: + os.path.join(os.path.dirname(__file__), "version_frozen.py"), + "w", encoding="utf8") as f: f.write(python_code) print(f"{f.name} created") else: diff --git a/searx_extra/update/update_external_bangs.py b/searx_extra/update/update_external_bangs.py index c366fe76b..e6331d47c 100755 --- a/searx_extra/update/update_external_bangs.py +++ b/searx_extra/update/update_external_bangs.py @@ -154,5 +154,5 @@ if __name__ == '__main__': 'version': bangs_version, 'trie': parse_ddg_bangs(fetch_ddg_bangs(bangs_url)) } - with open(get_bangs_filename(), 'w') as fp: + with open(get_bangs_filename(), 'w', encoding="utf8") as fp: json.dump(output, fp, ensure_ascii=False, indent=4) diff --git a/searx_extra/update/update_osm_keys_tags.py b/searx_extra/update/update_osm_keys_tags.py index f803d0c33..a71f2d9a1 100755 --- a/searx_extra/update/update_osm_keys_tags.py +++ b/searx_extra/update/update_osm_keys_tags.py @@ -205,5 +205,5 @@ if __name__ == '__main__': 'keys': optimize_keys(get_keys()), 'tags': optimize_tags(get_tags()), } - with open(get_osm_tags_filename(), 'w') as f: + with open(get_osm_tags_filename(), 'w', encoding="utf8") as f: json.dump(result, f, indent=4, ensure_ascii=False) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 2c244966b..91ec2499d 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -114,9 +114,9 @@ class TestUtils(SearxTestCase): def test_ecma_unscape(self): self.assertEqual(utils.ecma_unescape('text%20with%20space'), 'text with space') self.assertEqual(utils.ecma_unescape('text using %xx: %F3'), - u'text using %xx: ó') + 'text using %xx: ó') self.assertEqual(utils.ecma_unescape('text using %u: %u5409, %u4E16%u754c'), - u'text using %u: 吉, 世界') + 'text using %u: 吉, 世界') class TestHTMLTextExtractor(SearxTestCase): |