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/engines/currency_convert.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'searx/engines/currency_convert.py') diff --git a/searx/engines/currency_convert.py b/searx/engines/currency_convert.py index 8eab8f673..7281b7175 100644 --- a/searx/engines/currency_convert.py +++ b/searx/engines/currency_convert.py @@ -1,14 +1,11 @@ import json import re import os -import sys import unicodedata from io import open from datetime import datetime -if sys.version_info[0] == 3: - unicode = str categories = [] url = 'https://duckduckgo.com/js/spice/currency/1/{0}/{1}' @@ -20,7 +17,7 @@ db = 1 def normalize_name(name): - name = name.decode('utf-8').lower().replace('-', ' ').rstrip('s') + name = name.decode().lower().replace('-', ' ').rstrip('s') name = re.sub(' +', ' ', name) return unicodedata.normalize('NFKD', name).lower() -- 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/engines/currency_convert.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/engines/currency_convert.py') diff --git a/searx/engines/currency_convert.py b/searx/engines/currency_convert.py index 7281b7175..c6067c4a8 100644 --- a/searx/engines/currency_convert.py +++ b/searx/engines/currency_convert.py @@ -11,13 +11,13 @@ categories = [] url = 'https://duckduckgo.com/js/spice/currency/1/{0}/{1}' weight = 100 -parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) +parser_re = re.compile('.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) db = 1 def normalize_name(name): - name = name.decode().lower().replace('-', ' ').rstrip('s') + name = name.lower().replace('-', ' ').rstrip('s') name = re.sub(' +', ' ', name) return unicodedata.normalize('NFKD', name).lower() -- cgit v1.2.3