From 1022228d950c2a809ed613df1a515d9a6cafda7c Mon Sep 17 00:00:00 2001 From: Dalf Date: Thu, 6 Aug 2020 17:42:46 +0200 Subject: Drop Python 2 (1/n): remove unicode string and url_utils --- searx/query.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'searx/query.py') diff --git a/searx/query.py b/searx/query.py index e8b57d4ca..69481f094 100644 --- a/searx/query.py +++ b/searx/query.py @@ -17,15 +17,13 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2014 by Thomas Pointhuber, ''' +import re + from searx.languages import language_codes from searx.engines import ( categories, engines, engine_shortcuts ) -import re -import sys -if sys.version_info[0] == 3: - unicode = str VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$') @@ -93,7 +91,7 @@ class RawTextQuery(object): # check if any language-code is equal with # declared language-codes for lc in language_codes: - lang_id, lang_name, country, english_name = map(unicode.lower, lc) + lang_id, lang_name, country, english_name = map(str.lower, lc) # if correct language-code is found # set it as new search-language @@ -177,7 +175,7 @@ class RawTextQuery(object): def getFullQuery(self): # get full querry including whitespaces - return u''.join(self.query_parts) + return ''.join(self.query_parts) class SearchQuery(object): @@ -185,7 +183,7 @@ class SearchQuery(object): def __init__(self, query, engines, categories, lang, safesearch, pageno, time_range, timeout_limit=None, preferences=None, external_bang=None): - self.query = query.encode('utf-8') + self.query = query.encode() self.engines = engines self.categories = categories self.lang = lang -- cgit v1.2.3 From 78883777438fc07833d983c50d9b131eb6feb9eb Mon Sep 17 00:00:00 2001 From: Dalf Date: Wed, 12 Aug 2020 09:42:27 +0200 Subject: Drop Python 2 (3/n): objects --- searx/query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/query.py') diff --git a/searx/query.py b/searx/query.py index 69481f094..614e05c6b 100644 --- a/searx/query.py +++ b/searx/query.py @@ -28,7 +28,7 @@ from searx.engines import ( VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$') -class RawTextQuery(object): +class RawTextQuery: """parse raw text query (the value from the html input)""" def __init__(self, query, disabled_engines): @@ -178,7 +178,7 @@ class RawTextQuery(object): return ''.join(self.query_parts) -class SearchQuery(object): +class SearchQuery: """container for all the search parameters (query, language, etc...)""" def __init__(self, query, engines, categories, lang, safesearch, pageno, time_range, -- cgit v1.2.3 From c225db45c8a4ab466bff049216f7e0189dc1b067 Mon Sep 17 00:00:00 2001 From: Dalf Date: Tue, 11 Aug 2020 16:25:03 +0200 Subject: Drop Python 2 (4/n): SearchQuery.query is a str instead of bytes --- searx/query.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'searx/query.py') diff --git a/searx/query.py b/searx/query.py index 614e05c6b..ef323af7a 100644 --- a/searx/query.py +++ b/searx/query.py @@ -32,6 +32,7 @@ class RawTextQuery: """parse raw text query (the value from the html input)""" def __init__(self, query, disabled_engines): + assert isinstance(query, str) self.query = query self.disabled_engines = [] @@ -51,7 +52,7 @@ class RawTextQuery: self.query_parts = [] # split query, including whitespaces - raw_query_parts = re.split(r'(\s+)' if isinstance(self.query, str) else b'(\s+)', self.query) + raw_query_parts = re.split(r'(\s+)', self.query) parse_next = True @@ -183,7 +184,7 @@ class SearchQuery: def __init__(self, query, engines, categories, lang, safesearch, pageno, time_range, timeout_limit=None, preferences=None, external_bang=None): - self.query = query.encode() + self.query = query self.engines = engines self.categories = categories self.lang = lang @@ -195,4 +196,4 @@ class SearchQuery: self.external_bang = external_bang def __str__(self): - return str(self.query) + ";" + str(self.engines) + return self.query + ";" + str(self.engines) -- cgit v1.2.3