git.iko.soy/searx
on master help sign in
[fix] pep8, tests
commit832ea60e3d19add2ffa857bc420ff33af83aac5c authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateSun 8 Feb 2015, 22:01 (12 years ago) parente7de967
5 files changed+5−5
compare with master
unifiedsplit
searx/engines/bing_images.py+1 searx/engines/blekko_images.py+1 searx/tests/engines/test_bing_images.py+1 searx/tests/engines/test_blekko_images.py+1 searx/webapp.py+1−5
searx/engines/bing_images.py+1
@@ -33,6 +33,7 @@ safesearch_types = {2: 'STRICT',
3333 1: 'DEMOTE',
3434 0: 'OFF'}
3535
36+
3637# do search-request
3738def request(query, params):
3839 offset = (params['pageno'] - 1) * 10 + 1
searx/engines/blekko_images.py+1
@@ -25,6 +25,7 @@ safesearch_types = {2: '1',
2525 1: '',
2626 0: '0'}
2727
28+
2829# do search-request
2930def request(query, params):
3031 c = (params['pageno'] - 1) * 48
searx/tests/engines/test_bing_images.py+1
@@ -12,6 +12,7 @@ class TestBingImagesEngine(SearxTestCase):
1212 dicto = defaultdict(dict)
1313 dicto['pageno'] = 1
1414 dicto['language'] = 'fr_FR'
15+ dicto['safesearch'] = 1
1516 params = bing_images.request(query, dicto)
1617 self.assertTrue('url' in params)
1718 self.assertTrue(query in params['url'])
searx/tests/engines/test_blekko_images.py+1
@@ -10,6 +10,7 @@ class TestBlekkoImagesEngine(SearxTestCase):
1010 query = 'test_query'
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 0
13+ dicto['safesearch'] = 1
1314 params = blekko_images.request(query, dicto)
1415 self.assertTrue('url' in params)
1516 self.assertTrue(query in params['url'])
searx/webapp.py+1−5
@@ -457,10 +457,6 @@ def preferences():
457457 Settings that are going to be saved as cookies."""
458458 lang = None
459459 image_proxy = request.cookies.get('image_proxy', settings['server'].get('image_proxy'))
460− try:
461− savesearch = int(request.cookies.get('savesearch', 1))
462− except ValueError:
463− savesearch = 1
464460
465461 if request.cookies.get('language')\
466462 and request.cookies['language'] in (x[0] for x in language_codes):
@@ -539,7 +535,7 @@ def preferences():
539535 )
540536
541537 resp.set_cookie('method', method, max_age=cookie_max_age)
542−
538+
543539 resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age)
544540
545541 resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age)