浏览代码

[fix] pep8, tests

Thomas Pointhuber 10 年前
父节点
当前提交
832ea60e3d

+ 1
- 0
searx/engines/bing_images.py 查看文件

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

+ 1
- 0
searx/engines/blekko_images.py 查看文件

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

+ 1
- 0
searx/tests/engines/test_bing_images.py 查看文件

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

+ 1
- 0
searx/tests/engines/test_blekko_images.py 查看文件

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

+ 1
- 5
searx/webapp.py 查看文件

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