浏览代码

[fix] pep8

Thomas Pointhuber 10 年前
父节点
当前提交
91f9973227
共有 2 个文件被更改,包括 24 次插入16 次删除
  1. 7
    4
      searx/engines/mediawiki.py
  2. 17
    12
      searx/engines/yacy.py

+ 7
- 4
searx/engines/mediawiki.py 查看文件

28
                                  '&srprop=timestamp'\
28
                                  '&srprop=timestamp'\
29
                                  '&format=json'\
29
                                  '&format=json'\
30
                                  '&sroffset={offset}'\
30
                                  '&sroffset={offset}'\
31
-                                 '&srlimit={limit}'
31
+                                 '&srlimit={limit}'     # noqa
32
 
32
 
33
 
33
 
34
 # do search-request
34
 # do search-request
35
 def request(query, params):
35
 def request(query, params):
36
     offset = (params['pageno'] - 1) * number_of_results
36
     offset = (params['pageno'] - 1) * number_of_results
37
+
37
     string_args = dict(query=urlencode({'srsearch': query}),
38
     string_args = dict(query=urlencode({'srsearch': query}),
38
-                        offset=offset,
39
-                        limit=number_of_results)
39
+                       offset=offset,
40
+                       limit=number_of_results)
41
+
40
     format_strings = list(Formatter().parse(base_url))
42
     format_strings = list(Formatter().parse(base_url))
41
 
43
 
42
     if params['language'] == 'all':
44
     if params['language'] == 'all':
67
 
69
 
68
     # parse results
70
     # parse results
69
     for result in search_results['query']['search']:
71
     for result in search_results['query']['search']:
70
-        url = base_url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
72
+        url = base_url.format(language=resp.search_params['language']) +\
73
+            'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
71
 
74
 
72
         # append result
75
         # append result
73
         results.append({'url': url,
76
         results.append({'url': url,

+ 17
- 12
searx/engines/yacy.py 查看文件

24
 
24
 
25
 # search-url
25
 # search-url
26
 base_url = 'http://localhost:8090'
26
 base_url = 'http://localhost:8090'
27
-search_url = '/yacysearch.json?{query}&startRecord={offset}&maximumRecords={limit}&contentdom={search_type}&resource=global'
27
+search_url = '/yacysearch.json?{query}'\
28
+                             '&startRecord={offset}'\
29
+                             '&maximumRecords={limit}'\
30
+                             '&contentdom={search_type}'\
31
+                             '&resource=global'             # noqa
28
 
32
 
29
 # yacy specific type-definitions
33
 # yacy specific type-definitions
30
 search_types = {'general': 'text',
34
 search_types = {'general': 'text',
39
     offset = (params['pageno'] - 1) * number_of_results
43
     offset = (params['pageno'] - 1) * number_of_results
40
     search_type = search_types.get(params['category'], '0')
44
     search_type = search_types.get(params['category'], '0')
41
 
45
 
42
-    params['url'] = base_url + search_url.format(query=urlencode({'query': query}),
43
-                                                 offset=offset,
44
-                                                 limit=number_of_results,
45
-                                                 search_type=search_type)
46
+    params['url'] = base_url +\
47
+        search_url.format(query=urlencode({'query': query}),
48
+                          offset=offset,
49
+                          limit=number_of_results,
50
+                          search_type=search_type)
46
 
51
 
47
     # add language tag if specified
52
     # add language tag if specified
48
     if params['language'] != 'all':
53
     if params['language'] != 'all':
70
 
75
 
71
             # append result
76
             # append result
72
             results.append({'url': result['link'],
77
             results.append({'url': result['link'],
73
-                        'title': result['title'],
74
-                        'content': result['description'],
75
-                        'publishedDate': publishedDate})
78
+                            'title': result['title'],
79
+                            'content': result['description'],
80
+                            'publishedDate': publishedDate})
76
 
81
 
77
     elif resp.search_params['category'] == 'images':
82
     elif resp.search_params['category'] == 'images':
78
         # parse image results
83
         # parse image results
79
         for result in search_results:
84
         for result in search_results:
80
             # append result
85
             # append result
81
             results.append({'url': result['url'],
86
             results.append({'url': result['url'],
82
-                        'title': result['title'],
83
-                        'content': '',
84
-                        'img_src': result['image'],
85
-                        'template': 'images.html'})
87
+                            'title': result['title'],
88
+                            'content': '',
89
+                            'img_src': result['image'],
90
+                            'template': 'images.html'})
86
 
91
 
87
     #TODO parse video, audio and file results
92
     #TODO parse video, audio and file results
88
 
93