Drop Python 2 (1/n): remove unicode string and url_utils

This commit is contained in:
Dalf 2020-08-06 17:42:46 +02:00 committed by Alexandre Flament
parent 272158944b
commit 1022228d95
112 changed files with 388 additions and 535 deletions

View file

@ -9,9 +9,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), query_text)
self.assertEquals(len(query.query_parts), 1)
self.assertEquals(len(query.languages), 0)
self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 1)
self.assertEqual(len(query.languages), 0)
self.assertFalse(query.specific)
def test_language_code(self):
@ -21,9 +21,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), full_query)
self.assertEquals(len(query.query_parts), 3)
self.assertEquals(len(query.languages), 1)
self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3)
self.assertEqual(len(query.languages), 1)
self.assertIn(language, query.languages)
self.assertFalse(query.specific)
@ -34,8 +34,8 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), full_query)
self.assertEquals(len(query.query_parts), 3)
self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3)
self.assertIn('en', query.languages)
self.assertFalse(query.specific)
@ -46,8 +46,8 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), full_query)
self.assertEquals(len(query.query_parts), 3)
self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3)
self.assertIn('all', query.languages)
self.assertFalse(query.specific)
@ -58,9 +58,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), full_query)
self.assertEquals(len(query.query_parts), 1)
self.assertEquals(len(query.languages), 0)
self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 1)
self.assertEqual(len(query.languages), 0)
self.assertFalse(query.specific)
def test_timeout_below100(self):
@ -68,9 +68,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), query_text)
self.assertEquals(len(query.query_parts), 3)
self.assertEquals(query.timeout_limit, 3)
self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3)
self.assertEqual(query.timeout_limit, 3)
self.assertFalse(query.specific)
def test_timeout_above100(self):
@ -78,9 +78,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), query_text)
self.assertEquals(len(query.query_parts), 3)
self.assertEquals(query.timeout_limit, 0.35)
self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3)
self.assertEqual(query.timeout_limit, 0.35)
self.assertFalse(query.specific)
def test_timeout_above1000(self):
@ -88,9 +88,9 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), query_text)
self.assertEquals(len(query.query_parts), 3)
self.assertEquals(query.timeout_limit, 3.5)
self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3)
self.assertEqual(query.timeout_limit, 3.5)
self.assertFalse(query.specific)
def test_timeout_invalid(self):
@ -99,8 +99,8 @@ class TestQuery(SearxTestCase):
query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEquals(query.getFullQuery(), query_text)
self.assertEquals(len(query.query_parts), 1)
self.assertEquals(query.query_parts[0], query_text)
self.assertEquals(query.timeout_limit, None)
self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 1)
self.assertEqual(query.query_parts[0], query_text)
self.assertEqual(query.timeout_limit, None)
self.assertFalse(query.specific)