Merge branch 'master' of https://github.com/asciimoo/searx

1 files changed, 14 insertions, 6 deletions

diff --git a/searx/engines/json_engine.py b/searx/engines/json_engine.py
index 0386d53f7..e7cc808bb 100644
--- a/searx/engines/json_engine.py
+++ b/searx/engines/json_engine.py
@@ -2,12 +2,13 @@ from urllib import urlencode
 from json import loads
 from collections import Iterable
 
-search_url    = None
-url_query     = None
+search_url = None
+url_query = None
 content_query = None
-title_query   = None
+title_query = None
 #suggestion_xpath = ''
 
+
 def iterate(iterable):
     if type(iterable) == dict:
         it = iterable.iteritems()
@@ -17,11 +18,15 @@ def iterate(iterable):
     for index, value in it:
         yield str(index), value
 
+
 def is_iterable(obj):
-    if type(obj) == str: return False
-    if type(obj) == unicode: return False
+    if type(obj) == str:
+        return False
+    if type(obj) == unicode:
+        return False
     return isinstance(obj, Iterable)
 
+
 def parse(query):
     q = []
     for part in query.split('/'):
@@ -31,6 +36,7 @@ def parse(query):
             q.append(part)
     return q
 
+
 def do_query(data, q):
     ret = []
     if not len(q):
@@ -38,7 +44,7 @@ def do_query(data, q):
 
     qkey = q[0]
 
-    for key,value in iterate(data):
+    for key, value in iterate(data):
 
         if len(q) == 1:
             if key == qkey:
@@ -54,11 +60,13 @@ def do_query(data, q):
                 ret.extend(do_query(value, q))
     return ret
 
+
 def query(data, query_string):
     q = parse(query_string)
 
     return do_query(data, q)
 
+
 def request(query, params):
     query = urlencode({'q': query})[2:]
     params['url'] = search_url.format(query=query)