From f0842c76e5166504bf4a2f7274659e9c1074f4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <kvch@users.noreply.github.com>
Date: Sun, 16 Jan 2022 15:04:32 +0100
Subject: [PATCH] Drop Python 3.6 support (#3133)

---
 .github/workflows/integration.yml |  2 +-
 searx/network/__init__.py         | 24 +-----------------------
 searx/network/client.py           |  9 +--------
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index f1d9692e..0e3ae48d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
diff --git a/searx/network/__init__.py b/searx/network/__init__.py
index f55e4d84..3794fcca 100644
--- a/searx/network/__init__.py
+++ b/searx/network/__init__.py
@@ -4,6 +4,7 @@ import asyncio
 import threading
 import concurrent.futures
 from time import time
+from queue import SimpleQueue
 
 import httpx
 import h2.exceptions
@@ -12,29 +13,6 @@ from .network import get_network, initialize, check_network_configuration
 from .client import get_loop
 from .raise_for_httperror import raise_for_httperror
 
-# queue.SimpleQueue: Support Python 3.6
-try:
-    from queue import SimpleQueue
-except ImportError:
-    from queue import Empty
-    from collections import deque
-
-    class SimpleQueue:
-        """Minimal backport of queue.SimpleQueue"""
-
-        def __init__(self):
-            self._queue = deque()
-            self._count = threading.Semaphore(0)
-
-        def put(self, item):
-            self._queue.append(item)
-            self._count.release()
-
-        def get(self):
-            if not self._count.acquire(True):
-                raise Empty
-            return self._queue.popleft()
-
 
 THREADLOCAL = threading.local()
 
diff --git a/searx/network/client.py b/searx/network/client.py
index 4bf7fb74..0f68e16b 100644
--- a/searx/network/client.py
+++ b/searx/network/client.py
@@ -3,6 +3,7 @@
 import asyncio
 import logging
 import threading
+import uvloop
 
 import httpcore
 import httpx
@@ -17,14 +18,6 @@ import python_socks._errors
 
 from searx import logger
 
-# Optional uvloop (support Python 3.6)
-try:
-    import uvloop
-except ImportError:
-    pass
-else:
-    uvloop.install()
-
 
 logger = logger.getChild('searx.http.client')
 LOOP = None