ソースを参照

[fix] pep8, tests

Thomas Pointhuber 10 年 前
コミット
832ea60e3d
共有5 個のファイルを変更した5 個の追加5 個の削除を含む
  1. 1
    0
      searx/engines/bing_images.py
  2. 1
    0
      searx/engines/blekko_images.py
  3. 1
    0
      searx/tests/engines/test_bing_images.py
  4. 1
    0
      searx/tests/engines/test_blekko_images.py
  5. 1
    5
      searx/webapp.py

+ 1
- 0
searx/engines/bing_images.py ファイルの表示

@@ -33,6 +33,7 @@ safesearch_types = {2: 'STRICT',
33 33
                     1: 'DEMOTE',
34 34
                     0: 'OFF'}
35 35
 
36
+
36 37
 # do search-request
37 38
 def request(query, params):
38 39
     offset = (params['pageno'] - 1) * 10 + 1

+ 1
- 0
searx/engines/blekko_images.py ファイルの表示

@@ -25,6 +25,7 @@ safesearch_types = {2: '1',
25 25
                     1: '',
26 26
                     0: '0'}
27 27
 
28
+
28 29
 # do search-request
29 30
 def request(query, params):
30 31
     c = (params['pageno'] - 1) * 48

+ 1
- 0
searx/tests/engines/test_bing_images.py ファイルの表示

@@ -12,6 +12,7 @@ class TestBingImagesEngine(SearxTestCase):
12 12
         dicto = defaultdict(dict)
13 13
         dicto['pageno'] = 1
14 14
         dicto['language'] = 'fr_FR'
15
+        dicto['safesearch'] = 1
15 16
         params = bing_images.request(query, dicto)
16 17
         self.assertTrue('url' in params)
17 18
         self.assertTrue(query in params['url'])

+ 1
- 0
searx/tests/engines/test_blekko_images.py ファイルの表示

@@ -10,6 +10,7 @@ class TestBlekkoImagesEngine(SearxTestCase):
10 10
         query = 'test_query'
11 11
         dicto = defaultdict(dict)
12 12
         dicto['pageno'] = 0
13
+        dicto['safesearch'] = 1
13 14
         params = blekko_images.request(query, dicto)
14 15
         self.assertTrue('url' in params)
15 16
         self.assertTrue(query in params['url'])

+ 1
- 5
searx/webapp.py ファイルの表示

@@ -457,10 +457,6 @@ def preferences():
457 457
     Settings that are going to be saved as cookies."""
458 458
     lang = None
459 459
     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
464 460
 
465 461
     if request.cookies.get('language')\
466 462
        and request.cookies['language'] in (x[0] for x in language_codes):
@@ -539,7 +535,7 @@ def preferences():
539 535
             )
540 536
 
541 537
         resp.set_cookie('method', method, max_age=cookie_max_age)
542
-        
538
+
543 539
         resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age)
544 540
 
545 541
         resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age)