summaryrefslogtreecommitdiff
path: root/searx/search.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-01-01 14:10:59 +0100
committerAdam Tauber <asciimoo@gmail.com>2015-01-01 14:10:59 +0100
commit469e08881ee17d8a180d0c0741c1552a29108f0e (patch)
tree59db47065d54fdde5576babc19155f128359386f /searx/search.py
parentc7cbd38fcc60601dd3b41df8a3a234c079f5dc0b (diff)
parent5d977056f7aa216eae09a22c3baaff73546f6ff1 (diff)
Merge pull request #165 from Cqoicebordel/Moar-engines
Moar engines
Diffstat (limited to 'searx/search.py')
-rw-r--r--searx/search.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/searx/search.py b/searx/search.py
index d1d03805f..fbbf3fe41 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -69,11 +69,16 @@ def threaded_requests(requests):
print('engine timeout: {0}'.format(th._engine_name))
-
# get default reqest parameter
def default_request_params():
return {
- 'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}, 'verify': True}
+ 'method': 'GET',
+ 'headers': {},
+ 'data': {},
+ 'url': '',
+ 'cookies': {},
+ 'verify': True
+ }
# create a callback wrapper for the search engine results
@@ -487,14 +492,15 @@ class Search(object):
continue
# append request to list
- requests.append((req, request_params['url'], request_args, selected_engine['name']))
+ requests.append((req, request_params['url'],
+ request_args,
+ selected_engine['name']))
if not requests:
return results, suggestions, answers, infoboxes
# send all search-request
threaded_requests(requests)
-
while not results_queue.empty():
engine_name, engine_results = results_queue.get_nowait()