searx

commit: 91f9973227e003604e036278e42a4c6394bf5478
parent 672f1c674ca63b7589c1bc6b0c32caf439bd16db
Author: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date:   Tue, 16 Dec 2014 17:10:20 +0100

[fix] pep8

Diffstat:
M
searx/engines/mediawiki.py
11
+++++++----
M
searx/engines/yacy.py
29
+++++++++++++++++------------

2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/searx/engines/mediawiki.py b/searx/engines/mediawiki.py
@@ -28,15 +28,17 @@ search_url = base_url + 'w/api.php?action=query'\
                                  '&srprop=timestamp'\
                                  '&format=json'\
                                  '&sroffset={offset}'\
-                                 '&srlimit={limit}'
+                                 '&srlimit={limit}'     # noqa
 
 
 # do search-request
 def request(query, params):
     offset = (params['pageno'] - 1) * number_of_results
+
     string_args = dict(query=urlencode({'srsearch': query}),
-                        offset=offset,
-                        limit=number_of_results)
+                       offset=offset,
+                       limit=number_of_results)
+
     format_strings = list(Formatter().parse(base_url))
 
     if params['language'] == 'all':
@@ -67,7 +69,8 @@ def response(resp):
 
     # parse results
     for result in search_results['query']['search']:
-        url = base_url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
+        url = base_url.format(language=resp.search_params['language']) +\
+            'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
 
         # append result
         results.append({'url': url,
diff --git a/searx/engines/yacy.py b/searx/engines/yacy.py
@@ -24,7 +24,11 @@ number_of_results = 5
 
 # search-url
 base_url = 'http://localhost:8090'
-search_url = '/yacysearch.json?{query}&startRecord={offset}&maximumRecords={limit}&contentdom={search_type}&resource=global'
+search_url = '/yacysearch.json?{query}'\
+                             '&startRecord={offset}'\
+                             '&maximumRecords={limit}'\
+                             '&contentdom={search_type}'\
+                             '&resource=global'             # noqa
 
 # yacy specific type-definitions
 search_types = {'general': 'text',
@@ -39,10 +43,11 @@ def request(query, params):
     offset = (params['pageno'] - 1) * number_of_results
     search_type = search_types.get(params['category'], '0')
 
-    params['url'] = base_url + search_url.format(query=urlencode({'query': query}),
-                                                 offset=offset,
-                                                 limit=number_of_results,
-                                                 search_type=search_type)
+    params['url'] = base_url +\
+        search_url.format(query=urlencode({'query': query}),
+                          offset=offset,
+                          limit=number_of_results,
+                          search_type=search_type)
 
     # add language tag if specified
     if params['language'] != 'all':
@@ -70,19 +75,19 @@ def response(resp):
 
             # append result
             results.append({'url': result['link'],
-                        'title': result['title'],
-                        'content': result['description'],
-                        'publishedDate': publishedDate})
+                            'title': result['title'],
+                            'content': result['description'],
+                            'publishedDate': publishedDate})
 
     elif resp.search_params['category'] == 'images':
         # parse image results
         for result in search_results:
             # append result
             results.append({'url': result['url'],
-                        'title': result['title'],
-                        'content': '',
-                        'img_src': result['image'],
-                        'template': 'images.html'})
+                            'title': result['title'],
+                            'content': '',
+                            'img_src': result['image'],
+                            'template': 'images.html'})
 
     #TODO parse video, audio and file results