diff options
| -rw-r--r-- | docs/admin/engines/settings.rst | 2 | ||||
| -rw-r--r-- | docs/user/search_syntax.rst | 3 | ||||
| -rw-r--r-- | searx/query.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_query.py | 14 |
4 files changed, 5 insertions, 16 deletions
diff --git a/docs/admin/engines/settings.rst b/docs/admin/engines/settings.rst index 71e841774..a829b870c 100644 --- a/docs/admin/engines/settings.rst +++ b/docs/admin/engines/settings.rst @@ -302,7 +302,7 @@ engine is shown. Most of the options have a default value or even are optional. search engine. ``shortcut`` : - Code used to execute bang requests (in this case using ``!bi`` or ``?bi``) + Code used to execute bang requests (in this case using ``!bi``) ``base_url`` : optional Part of the URL that should be stable across every request. Can be useful to diff --git a/docs/user/search_syntax.rst b/docs/user/search_syntax.rst index 50cd8fabb..e9ed3e870 100644 --- a/docs/user/search_syntax.rst +++ b/docs/user/search_syntax.rst @@ -14,9 +14,6 @@ Prefix ``!`` Prefix: ``:`` to set language -Prefix: ``?`` - to add engines and categories to the currently selected categories - Abbrevations of the engines and languages are also accepted. Engine/category modifiers are chainable and inclusive (e.g. with :search:`!it !ddg !wp qwer <?q=%21it%20%21ddg%20%21wp%20qwer>` search in IT category **and** duckduckgo diff --git a/searx/query.py b/searx/query.py index 5d2d9de26..f5f628823 100644 --- a/searx/query.py +++ b/searx/query.py @@ -177,7 +177,7 @@ class ExternalBangParser(QueryPartParser): class BangParser(QueryPartParser): @staticmethod def check(raw_value): - return raw_value[0] == '!' or raw_value[0] == '?' + return raw_value[0] == '!' def __call__(self, raw_value): value = raw_value[1:].replace('-', ' ').replace('_', ' ') diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py index 9a53f8f47..05fcafe30 100644 --- a/tests/unit/test_query.py +++ b/tests/unit/test_query.py @@ -230,13 +230,12 @@ class TestExternalBangParser(SearxTestCase): class TestBang(SearxTestCase): SPECIFIC_BANGS = ['!dummy_engine', '!du', '!general'] - NOT_SPECIFIC_BANGS = ['?dummy_engine', '?du', '?general'] THE_QUERY = 'the query' def test_bang(self): load_engines(TEST_ENGINES) - for bang in TestBang.SPECIFIC_BANGS + TestBang.NOT_SPECIFIC_BANGS: + for bang in TestBang.SPECIFIC_BANGS: with self.subTest(msg="Check bang", bang=bang): query_text = TestBang.THE_QUERY + ' ' + bang query = RawTextQuery(query_text, []) @@ -252,13 +251,6 @@ class TestBang(SearxTestCase): query = RawTextQuery(query_text, []) self.assertTrue(query.specific) - def test_not_specific(self): - for bang in TestBang.NOT_SPECIFIC_BANGS: - with self.subTest(msg="Check bang is not specific", bang=bang): - query_text = TestBang.THE_QUERY + ' ' + bang - query = RawTextQuery(query_text, []) - self.assertFalse(query.specific) - def test_bang_not_found(self): load_engines(TEST_ENGINES) query = RawTextQuery('the query !bang_not_found', []) @@ -278,5 +270,5 @@ class TestBang(SearxTestCase): query = RawTextQuery('the query !', []) self.assertEqual(query.autocomplete_list, ['!images', '!wikipedia', '!osm']) - query = RawTextQuery('the query ?', ['osm']) - self.assertEqual(query.autocomplete_list, ['?images', '?wikipedia']) + query = RawTextQuery('the query !', ['osm']) + self.assertEqual(query.autocomplete_list, ['!images', '!wikipedia']) |