on master help sign in
Merge pull request #2309 from dalf/mod_search_repr

[mod] searx.search: EngineRef, SearchQuery: add __repr__ and __eq__ methods

commit46b454277f70cb504a1276286e07048b8a5651bf authorAlexandre Flament <alex@al-f.net> dateSat 14 Nov 2020, 13:23 (6 years ago) parentebed1468fc74d0
3 files changed+36−5
searx/search.py+20−4 tests/unit/test_search.py+14 tests/unit/test_standalone_searx.py+2−1
searx/search.py+20−4
@@ -57,8 +57,11 @@ class EngineRef:
5757 self.category = category
5858 self.from_bang = from_bang
5959
60− def __str__(self):
61− return "(" + self.name + "," + self.category + "," + str(self.from_bang) + ")"
60+ def __repr__(self):
61+ return "EngineRef({!r}, {!r}, {!r})".format(self.name, self.category, self.from_bang)
62+
63+ def __eq__(self, other):
64+ return self.name == other.name and self.category == other.category and self.from_bang == other.from_bang
6265
6366
6467class SearchQuery:
@@ -87,8 +90,21 @@ class SearchQuery:
8790 self.timeout_limit = timeout_limit
8891 self.external_bang = external_bang
8992
90− def __str__(self):
91− return self.query + ";" + str(self.engineref_list)
93+ def __repr__(self):
94+ return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\
95+ format(self.query, self.engineref_list, self.categories, self.lang, self.safesearch,
96+ self.pageno, self.time_range, self.timeout_limit, self.external_bang)
97+
98+ def __eq__(self, other):
99+ return self.query == other.query\
100+ and self.engineref_list == other.engineref_list\
101+ and self.categories == self.categories\
102+ and self.lang == other.lang\
103+ and self.safesearch == other.safesearch\
104+ and self.pageno == other.pageno\
105+ and self.time_range == other.time_range\
106+ and self.timeout_limit == other.timeout_limit\
107+ and self.external_bang == other.external_bang
92108
93109
94110def send_http_request(engine, request_params):
tests/unit/test_search.py+14
@@ -21,6 +21,20 @@ TEST_ENGINES = [
2121]
2222
2323
24+class SearchQueryTestCase(SearxTestCase):
25+
26+ def test_repr(self):
27+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')
28+ self.assertEqual(repr(s),
29+ "SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')") # noqa
30+
31+ def test_eq(self):
32+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, None, None, None)
33+ t = SearchQuery('test', [EngineRef('google', 'general', False)], ['general'], 'all', 0, 1, None, None, None)
34+ self.assertEqual(s, s)
35+ self.assertNotEqual(s, t)
36+
37+
2438class SearchTestCase(SearxTestCase):
2539
2640 @classmethod
tests/unit/test_standalone_searx.py+2−1
@@ -7,6 +7,7 @@ import sys
77from mock import Mock, patch
88from nose2.tools import params
99
10+from searx.search import SearchQuery
1011from searx.testing import SearxTestCase
1112
1213
@@ -91,7 +92,7 @@ class StandaloneSearx(SearxTestCase):
9192 args = sas.parse_argument(['rain', ])
9293 search_q = sas.get_search_query(args)
9394 self.assertTrue(search_q)
94− self.assertEqual(str(search_q), 'rain;[]')
95+ self.assertEqual(search_q, SearchQuery('rain', [], ['general'], 'all', 0, 1, None, None, None))
9596
9697 def test_no_parsed_url(self):
9798 """test no_parsed_url func"""