summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Pointhuber <thomas.pointhuber@gmx.at>2015-02-08 22:01:24 +0100
committerThomas Pointhuber <thomas.pointhuber@gmx.at>2015-02-08 22:01:24 +0100
commit832ea60e3d19add2ffa857bc420ff33af83aac5c (patch)
treee0faf5b4a51d7e055fc11a29a12f3328f35f4f51
parente7de9674b14c2ff06fac009274742819d6468138 (diff)
[fix] pep8, tests
-rw-r--r--searx/engines/bing_images.py1
-rw-r--r--searx/engines/blekko_images.py1
-rw-r--r--searx/tests/engines/test_bing_images.py1
-rw-r--r--searx/tests/engines/test_blekko_images.py1
-rw-r--r--searx/webapp.py6
5 files changed, 5 insertions, 5 deletions
diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 4798d9f30..b8c61c151 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -33,6 +33,7 @@ safesearch_types = {2: 'STRICT',
1: 'DEMOTE',
0: 'OFF'}
+
# do search-request
def request(query, params):
offset = (params['pageno'] - 1) * 10 + 1
diff --git a/searx/engines/blekko_images.py b/searx/engines/blekko_images.py
index 4fbb9b30f..2e7ec904f 100644
--- a/searx/engines/blekko_images.py
+++ b/searx/engines/blekko_images.py
@@ -25,6 +25,7 @@ safesearch_types = {2: '1',
1: '',
0: '0'}
+
# do search-request
def request(query, params):
c = (params['pageno'] - 1) * 48
diff --git a/searx/tests/engines/test_bing_images.py b/searx/tests/engines/test_bing_images.py
index 59c134623..a1d96b06e 100644
--- a/searx/tests/engines/test_bing_images.py
+++ b/searx/tests/engines/test_bing_images.py
@@ -12,6 +12,7 @@ class TestBingImagesEngine(SearxTestCase):
dicto = defaultdict(dict)
dicto['pageno'] = 1
dicto['language'] = 'fr_FR'
+ dicto['safesearch'] = 1
params = bing_images.request(query, dicto)
self.assertTrue('url' in params)
self.assertTrue(query in params['url'])
diff --git a/searx/tests/engines/test_blekko_images.py b/searx/tests/engines/test_blekko_images.py
index 6a5388aae..793fadbad 100644
--- a/searx/tests/engines/test_blekko_images.py
+++ b/searx/tests/engines/test_blekko_images.py
@@ -10,6 +10,7 @@ class TestBlekkoImagesEngine(SearxTestCase):
query = 'test_query'
dicto = defaultdict(dict)
dicto['pageno'] = 0
+ dicto['safesearch'] = 1
params = blekko_images.request(query, dicto)
self.assertTrue('url' in params)
self.assertTrue(query in params['url'])
diff --git a/searx/webapp.py b/searx/webapp.py
index 7266de0f0..861f3aa29 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -457,10 +457,6 @@ def preferences():
Settings that are going to be saved as cookies."""
lang = None
image_proxy = request.cookies.get('image_proxy', settings['server'].get('image_proxy'))
- try:
- savesearch = int(request.cookies.get('savesearch', 1))
- except ValueError:
- savesearch = 1
if request.cookies.get('language')\
and request.cookies['language'] in (x[0] for x in language_codes):
@@ -539,7 +535,7 @@ def preferences():
)
resp.set_cookie('method', method, max_age=cookie_max_age)
-
+
resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age)
resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age)