on master help sign in
Merge pull request #2948 from searx/dependabot/pip/master/pylint-2.10.2
968b289Noémi Ványi
requirements-dev.txt+1−1
@@ -2,7 +2,7 @@ mock==4.0.3
2nose2[coverage_plugin]==0.10.0
2nose2[coverage_plugin]==0.10.0
3cov-core==1.15.0
3cov-core==1.15.0
4pycodestyle==2.7.0
4pycodestyle==2.7.0
5−pylint==2.9.6
5+pylint==2.10.2
6splinter==0.15.0
6splinter==0.15.0
7transifex-client==0.14.3
7transifex-client==0.14.3
8selenium==3.141.0
8selenium==3.141.0
searx/engines/google_images.py+1−1
@@ -70,7 +70,7 @@ filter_mapping = {
70def scrap_out_thumbs(dom):
70def scrap_out_thumbs(dom):
71 """Scrap out thumbnail data from <script> tags.
71 """Scrap out thumbnail data from <script> tags.
72 """
72 """
73− ret_val = dict()
73+ ret_val = {}
74 for script in eval_xpath(dom, '//script[contains(., "_setImgSrc(")]'):
74 for script in eval_xpath(dom, '//script[contains(., "_setImgSrc(")]'):
75 _script = script.text
75 _script = script.text
76 # _setImgSrc('0','data:image\/jpeg;base64,\/9j\/4AAQSkZJR ....');
76 # _setImgSrc('0','data:image\/jpeg;base64,\/9j\/4AAQSkZJR ....');
searx/engines/google_videos.py+1−1
@@ -84,7 +84,7 @@ def _re(regexpr):
84def scrap_out_thumbs(dom):
84def scrap_out_thumbs(dom):
85 """Scrap out thumbnail data from <script> tags.
85 """Scrap out thumbnail data from <script> tags.
86 """
86 """
87− ret_val = dict()
87+ ret_val = {}
88 thumb_name = 'vidthumb'
88 thumb_name = 'vidthumb'
89
89
90 for script in eval_xpath_list(dom, '//script[contains(., "_setImagesSrc")]'):
90 for script in eval_xpath_list(dom, '//script[contains(., "_setImagesSrc")]'):
searx/engines/meilisearch.py+1−1
@@ -11,7 +11,7 @@ from json import loads, dumps
11base_url = 'http://localhost:7700'
11base_url = 'http://localhost:7700'
12index = ''
12index = ''
13auth_key = ''
13auth_key = ''
14−facet_filters = list()
14+facet_filters = []
15_search_url = ''
15_search_url = ''
16result_template = 'key-value.html'
16result_template = 'key-value.html'
17categories = ['general']
17categories = ['general']
searx/preferences.py+3−3
@@ -283,7 +283,7 @@ class EnginesSetting(SwitchableSetting):
283 transformed_choices = []
283 transformed_choices = []
284 for engine_name, engine in self.choices.items(): # pylint: disable=no-member,access-member-before-definition
284 for engine_name, engine in self.choices.items(): # pylint: disable=no-member,access-member-before-definition
285 for category in engine.categories:
285 for category in engine.categories:
286− transformed_choice = dict()
286+ transformed_choice = {}
287 transformed_choice['default_on'] = not engine.disabled
287 transformed_choice['default_on'] = not engine.disabled
288 transformed_choice['id'] = '{}__{}'.format(engine_name, category)
288 transformed_choice['id'] = '{}__{}'.format(engine_name, category)
289 transformed_choices.append(transformed_choice)
289 transformed_choices.append(transformed_choice)
@@ -294,7 +294,7 @@ class EnginesSetting(SwitchableSetting):
294
294
295 def transform_values(self, values):
295 def transform_values(self, values):
296 if len(values) == 1 and next(iter(values)) == '':
296 if len(values) == 1 and next(iter(values)) == '':
297− return list()
297+ return []
298 transformed_values = []
298 transformed_values = []
299 for value in values:
299 for value in values:
300 engine, category = value.split('__')
300 engine, category = value.split('__')
@@ -309,7 +309,7 @@ class PluginsSetting(SwitchableSetting):
309 super()._post_init()
309 super()._post_init()
310 transformed_choices = []
310 transformed_choices = []
311 for plugin in self.choices: # pylint: disable=access-member-before-definition
311 for plugin in self.choices: # pylint: disable=access-member-before-definition
312− transformed_choice = dict()
312+ transformed_choice = {}
313 transformed_choice['default_on'] = plugin.default_on
313 transformed_choice['default_on'] = plugin.default_on
314 transformed_choice['id'] = plugin.id
314 transformed_choice['id'] = plugin.id
315 transformed_choices.append(transformed_choice)
315 transformed_choices.append(transformed_choice)
searx_extra/update/update_external_bangs.py+1−1
@@ -153,5 +153,5 @@ if __name__ == '__main__':
153 'version': bangs_version,
153 'version': bangs_version,
154 'trie': parse_ddg_bangs(fetch_ddg_bangs(bangs_url))
154 'trie': parse_ddg_bangs(fetch_ddg_bangs(bangs_url))
155 }
155 }
156− with open(get_bangs_filename(), 'w') as fp:
156+ with open(get_bangs_filename(), 'w', encoding='utf-8') as fp:
157 json.dump(output, fp, ensure_ascii=False, indent=4)
157 json.dump(output, fp, ensure_ascii=False, indent=4)
tests/unit/test_utils.py+2−2
@@ -114,9 +114,9 @@ class TestUtils(SearxTestCase):
114 def test_ecma_unscape(self):
114 def test_ecma_unscape(self):
115 self.assertEqual(utils.ecma_unescape('text%20with%20space'), 'text with space')
115 self.assertEqual(utils.ecma_unescape('text%20with%20space'), 'text with space')
116 self.assertEqual(utils.ecma_unescape('text using %xx: %F3'),
116 self.assertEqual(utils.ecma_unescape('text using %xx: %F3'),
117− u'text using %xx: ó')
117+ 'text using %xx: ó')
118 self.assertEqual(utils.ecma_unescape('text using %u: %u5409, %u4E16%u754c'),
118 self.assertEqual(utils.ecma_unescape('text using %u: %u5409, %u4E16%u754c'),
119− u'text using %u: 吉, 世界')
119+ 'text using %u: 吉, 世界')
120
120
121
121
122class TestHTMLTextExtractor(SearxTestCase):
122class TestHTMLTextExtractor(SearxTestCase):