summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-02-12 15:20:17 +0100
committerAdam Tauber <asciimoo@gmail.com>2015-02-12 15:20:17 +0100
commitec2516b93db6343afc4bd86291082dfb64914595 (patch)
tree5ebd088cc2b1e99385191ffd66b380975e18643b
parentf6db77d81ea87d99462b4c3cc40a8a27e0264724 (diff)
parent9d537c0bad5b68f9c83ea4ac026d22a27264b8dd (diff)
Merge pull request #233 from dalf/master
[fix] kickass engine
-rw-r--r--searx/engines/kickass.py7
-rw-r--r--searx/tests/engines/test_kickass.py6
2 files changed, 9 insertions, 4 deletions
diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py
index 8b89e1f47..4e5a64350 100644
--- a/searx/engines/kickass.py
+++ b/searx/engines/kickass.py
@@ -20,7 +20,7 @@ categories = ['videos', 'music', 'files']
paging = True
# search-url
-url = 'https://kickass.so/'
+url = 'https://kickass.to/'
search_url = url + 'search/{search_term}/{pageno}/'
# specific xpath variables
@@ -45,6 +45,11 @@ def request(query, params):
def response(resp):
results = []
+ # check if redirect comparing to the True value,
+ # because resp can be a Mock object, and any attribut name returns something.
+ if resp.is_redirect is True:
+ return results
+
dom = html.fromstring(resp.text)
search_res = dom.xpath('//table[@class="data"]//tr')
diff --git a/searx/tests/engines/test_kickass.py b/searx/tests/engines/test_kickass.py
index 3c20a97e7..971d0847e 100644
--- a/searx/tests/engines/test_kickass.py
+++ b/searx/tests/engines/test_kickass.py
@@ -14,7 +14,7 @@ class TestKickassEngine(SearxTestCase):
params = kickass.request(query, dicto)
self.assertIn('url', params)
self.assertIn(query, params['url'])
- self.assertIn('kickass.so', params['url'])
+ self.assertIn('kickass.to', params['url'])
self.assertIn('verify', params)
self.assertFalse(params['verify'])
@@ -98,7 +98,7 @@ class TestKickassEngine(SearxTestCase):
self.assertEqual(type(results), list)
self.assertEqual(len(results), 1)
self.assertEqual(results[0]['title'], 'This should be the title')
- self.assertEqual(results[0]['url'], 'https://kickass.so/url.html')
+ self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
self.assertEqual(results[0]['content'], 'Posted by riri in Other &gt; Unsorted')
self.assertEqual(results[0]['seed'], 10)
self.assertEqual(results[0]['leech'], 1)
@@ -381,7 +381,7 @@ class TestKickassEngine(SearxTestCase):
self.assertEqual(type(results), list)
self.assertEqual(len(results), 5)
self.assertEqual(results[0]['title'], 'This should be the title')
- self.assertEqual(results[0]['url'], 'https://kickass.so/url.html')
+ self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
self.assertEqual(results[0]['content'], 'Posted by riri in Other &gt; Unsorted')
self.assertEqual(results[0]['seed'], 10)
self.assertEqual(results[0]['leech'], 1)