fix: cloudscrape revert alla stable

lib/cloudscraper/user_agent/__init__.py

@@ -1,95 +1,47 @@
-import json
-import os
-import random
-import sys
-import ssl
-
-from collections import OrderedDict
-
-# ------------------------------------------------------------------------------- #
-
-
-class User_Agent():
-
-    # ------------------------------------------------------------------------------- #
-
-    def __init__(self, *args, **kwargs):
-        self.headers = None
-        self.cipherSuite = []
-        self.loadUserAgent(*args, **kwargs)
-
-    # ------------------------------------------------------------------------------- #
-
-    def loadHeaders(self, user_agents, user_agent_version):
-        if user_agents.get(self.browser).get('releases').get(user_agent_version).get('headers'):
-            self.headers = user_agents.get(self.browser).get('releases').get(user_agent_version).get('headers')
-        else:
-            self.headers = user_agents.get(self.browser).get('default_headers')
-
-    # ------------------------------------------------------------------------------- #
-
-    def filterAgents(self, releases):
-        filtered = {}
-
-        for release in releases:
-            if self.mobile and releases[release]['User-Agent']['mobile']:
-                filtered[release] = filtered.get(release, []) + releases[release]['User-Agent']['mobile']
-
-            if self.desktop and releases[release]['User-Agent']['desktop']:
-                filtered[release] = filtered.get(release, []) + releases[release]['User-Agent']['desktop']
-
-        return filtered
-
-    # ------------------------------------------------------------------------------- #
-
-    def loadUserAgent(self, *args, **kwargs):
-        self.browser = kwargs.pop('browser', None)
-
-        if isinstance(self.browser, dict):
-            self.custom = self.browser.get('custom', None)
-            self.desktop = self.browser.get('desktop', True)
-            self.mobile = self.browser.get('mobile', True)
-            self.browser = self.browser.get('browser', None)
-        else:
-            self.custom = kwargs.pop('custom', None)
-            self.desktop = kwargs.pop('desktop', True)
-            self.mobile = kwargs.pop('mobile', True)
-
-        if not self.desktop and not self.mobile:
-            sys.tracebacklimit = 0
-            raise RuntimeError("Sorry you can't have mobile and desktop disabled at the same time.")
-
-        user_agents = json.load(
-            open(os.path.join(os.path.dirname(__file__), 'browsers.json'), 'r'),
-            object_pairs_hook=OrderedDict
-        )
-
-        if self.custom:
-            self.cipherSuite = '{}:!ECDHE+SHA:!AES128-SHA'.format(ssl._DEFAULT_CIPHERS).split(':')
-            self.headers = OrderedDict([
-                ('User-Agent', self.custom),
-                ('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8'),
-                ('Accept-Language', 'en-US,en;q=0.9'),
-                ('Accept-Encoding', 'gzip, deflate, br')
-            ])
-        else:
-            if self.browser and not user_agents.get(self.browser):
-                sys.tracebacklimit = 0
-                raise RuntimeError('Sorry "{}" browser User-Agent was not found.'.format(self.browser))
-
-            if not self.browser:
-                self.browser = random.SystemRandom().choice(list(user_agents))
-
-            self.cipherSuite = user_agents.get(self.browser).get('cipherSuite', [])
-
-            filteredAgents = self.filterAgents(user_agents.get(self.browser).get('releases'))
-
-            user_agent_version = random.SystemRandom().choice(list(filteredAgents))
-
-            self.loadHeaders(user_agents, user_agent_version)
-
-            self.headers['User-Agent'] = random.SystemRandom().choice(filteredAgents[user_agent_version])
-
-        if not kwargs.get('allow_brotli', False):
-            if 'br' in self.headers['Accept-Encoding']:
-                self.headers['Accept-Encoding'] = ','.join([encoding for encoding in self.headers['Accept-Encoding'].split(',') if encoding.strip() != 'br']).strip()
+import os
+import json
+import random
+import logging
+
+from collections import OrderedDict
+
+##########################################################################################################################################################
+
+
+class User_Agent():
+
+    ##########################################################################################################################################################
+
+    def __init__(self, *args, **kwargs):
+        self.headers = None
+        self.loadUserAgent(*args, **kwargs)
+
+    ##########################################################################################################################################################
+
+    def loadUserAgent(self, *args, **kwargs):
+        browser = kwargs.pop('browser', None)
+
+        user_agents = json.load(
+            open(os.path.join(os.path.dirname(__file__), 'browsers.json'), 'r'),
+            object_pairs_hook=OrderedDict
+        )
+
+        if browser and not user_agents.get(browser):
+            logging.error('Sorry "{}" browser User-Agent was not found.'.format(browser))
+            raise
+
+        if not browser:
+            browser = random.SystemRandom().choice(list(user_agents))
+
+        user_agent_version = random.SystemRandom().choice(list(user_agents.get(browser).get('releases')))
+
+        if user_agents.get(browser).get('releases').get(user_agent_version).get('headers'):
+            self.headers = user_agents.get(browser).get('releases').get(user_agent_version).get('headers')
+        else:
+            self.headers = user_agents.get(browser).get('default_headers')
+
+        self.headers['User-Agent'] = random.SystemRandom().choice(user_agents.get(browser).get('releases').get(user_agent_version).get('User-Agent'))
+
+        if not kwargs.get('allow_brotli', False):
+            if 'br' in self.headers['Accept-Encoding']:
+                self.headers['Accept-Encoding'] = ','.join([encoding for encoding in self.headers['Accept-Encoding'].split(',') if encoding.strip() != 'br']).strip()