From c6f7a731d5ae34bcc2cb01ed1c6d037ab88e57c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 07:03:23 +0000
Subject: [PATCH 1/5] Bump pylint from 2.9.6 to 2.10.2

Bumps [pylint](https://github.com/PyCQA/pylint) from 2.9.6 to 2.10.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.9.6...v2.10.2)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index e8dc0221c..445346d24 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

From b83c14cf6b2114686165c5aa568b34851b680970 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 31 Aug 2021 10:40:29 +0200
Subject: [PATCH 2/5] [pylint] Pylint 2.10 - fix use-list-literal &
 use-dict-literal

Pylint 2.10 added new default checks [1]:

use-list-literal
  Emitted when list() is called with no arguments instead of using []

use-dict-literal
  Emitted when dict() is called with no arguments instead of using {}

[1] https://pylint.pycqa.org/en/latest/whatsnew/2.10.html

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/engines/google_images.py | 2 +-
 searx/engines/google_videos.py | 2 +-
 searx/engines/meilisearch.py   | 2 +-
 searx/preferences.py           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

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/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)

From e856b563dd0af5447d51a7c8c4fae5ea697befc2 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 31 Aug 2021 10:49:36 +0200
Subject: [PATCH 3/5] [pylint] Pylint 2.10 - unspecified-encoding

Pylint 2.10 added new default checks [1]:

unspecified-encoding:
  Emitted when open() is called without specifying an encoding [2]

[1] https://pylint.pycqa.org/en/latest/whatsnew/2.10.html
[2] https://github.com/PyCQA/pylint/issues/3826

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/version.py                            | 4 ++--
 searx_extra/update/update_external_bangs.py | 2 +-
 searx_extra/update/update_osm_keys_tags.py  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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)

From 03e7d423be2e4dfd5abc64633fc06cbbd58acfc4 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 31 Aug 2021 10:51:50 +0200
Subject: [PATCH 4/5] [pylint] Pylint 2.10 - unused-variable

Pylint 2.10 fixed [1]:

  Fixed bug with cell-var-from-loop checker: it no longer has false negatives
  when both unused-variable and used-before-assignment are disabled.

[1] https://pylint.pycqa.org/en/latest/whatsnew/2.10.html

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/network/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:

From a1adc46fc886aeb41be152583dc4bbfdae7706d4 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 31 Aug 2021 10:54:40 +0200
Subject: [PATCH 5/5] [pylint] Pylint 2.10 - fix redundant-u-string-prefix

Pylint 2.10 added new default checks [1]:

redundant-u-string-prefix:
  Emitted when the u prefix is added to a string

[1] https://pylint.pycqa.org/en/latest/whatsnew/2.10.html
[2] https://github.com/PyCQA/pylint/issues/4102

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 tests/unit/test_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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):