From bf347745337509ac38f67bdd07f5851cad209136 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 27 Jul 2023 18:07:49 +0200
Subject: [PATCH] requests is always required now

---
 ox/cache.py | 50 ++++++++++++++++----------------------------------
 ox/net.py   | 22 +++++++---------------
 2 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/ox/cache.py b/ox/cache.py
index 097825c..b5ead82 100644
--- a/ox/cache.py
+++ b/ox/cache.py
@@ -12,12 +12,8 @@ import zlib
 
 from io import BytesIO
 import urllib
-try:
-    import requests
-    USE_REQUESTS = True
-    requests_session = requests.Session()
-except:
-    USE_REQUESTS = False
+import requests
+
 
 from .utils import json
 from .file import makedirs
@@ -27,6 +23,7 @@ from .net import DEFAULT_HEADERS, detect_encoding
 
 
 cache_timeout = 30*24*60*60  # default is 30 days
+requests_session = requests.Session()
 
 COMPRESS_TYPES = (
     'text/html',
@@ -100,35 +97,20 @@ def read_url(url, data=None, headers=None, timeout=cache_timeout, valid=None, un
     result = store.get(url, data, headers, timeout)
     url_headers = {}
     if not result:
-        if USE_REQUESTS:
-            if headers is None:
-                headers = DEFAULT_HEADERS.copy()
-            if data:
-                r = requests_session.post(url, data=data, headers=headers)
-            else:
-                r = requests_session.get(url, headers=headers)
-            for key in r.headers:
-                url_headers[key.lower()] = r.headers[key]
-            result = r.content
-            url_headers['Status'] = "%s" % r.status_code
-            if not valid or valid(result, url_headers):
-                store.set(url, post_data=data, data=result, headers=url_headers)
-            else:
-                raise InvalidResult(result, url_headers)
+        if headers is None:
+            headers = DEFAULT_HEADERS.copy()
+        if data:
+            r = requests_session.post(url, data=data, headers=headers)
         else:
-            try:
-                url_headers, result = net.read_url(url, data, headers, return_headers=True)
-            except urllib.error.HTTPError as e:
-                e.headers['Status'] = "%s" % e.code
-                for key in e.headers:
-                    url_headers[key.lower()] = e.headers[key]
-                result = e.read()
-                if url_headers.get('content-encoding', None) == 'gzip':
-                    result = gzip.GzipFile(fileobj=BytesIO(result)).read()
-            if not valid or valid(result, url_headers):
-                store.set(url, post_data=data, data=result, headers=url_headers)
-            else:
-                raise InvalidResult(result, url_headers)
+            r = requests_session.get(url, headers=headers)
+        for key in r.headers:
+            url_headers[key.lower()] = r.headers[key]
+        result = r.content
+        url_headers['Status'] = "%s" % r.status_code
+        if not valid or valid(result, url_headers):
+            store.set(url, post_data=data, data=result, headers=url_headers)
+        else:
+            raise InvalidResult(result, url_headers)
     if unicode:
         ctype = url_headers.get('content-type', '').lower()
         if 'charset' in ctype:
diff --git a/ox/net.py b/ox/net.py
index 17a56d4..4d58bad 100644
--- a/ox/net.py
+++ b/ox/net.py
@@ -8,11 +8,8 @@ import os
 import re
 import struct
 
-try:
-    import requests
-    USE_REQUESTS = True
-except:
-    USE_REQUESTS = False
+import requests
+
 from io import BytesIO
 import urllib
 from chardet.universaldetector import UniversalDetector
@@ -119,16 +116,11 @@ def save_url(url, filename, overwrite=False):
         if dirname and not os.path.exists(dirname):
             os.makedirs(dirname)
         headers = DEFAULT_HEADERS.copy()
-        if USE_REQUESTS:
-            r = requests.get(url, headers=headers, stream=True)
-            with open(filename, 'wb') as f:
-                for chunk in r.iter_content(chunk_size=1024):
-                    if chunk:  # filter out keep-alive new chunks
-                        f.write(chunk)
-        else:
-            data = read_url(url)
-            with open(filename, 'wb') as f:
-                f.write(data)
+        r = requests.get(url, headers=headers, stream=True)
+        with open(filename, 'wb') as f:
+            for chunk in r.iter_content(chunk_size=1024):
+                if chunk:  # filter out keep-alive new chunks
+                    f.write(chunk)
 
 def _get_size(url):
     req = urllib.request.Request(url, headers=DEFAULT_HEADERS.copy())