Add support for urllib3 version 2.0

Author: const-cloudinary

cloudinary/api_client/execute_request.py

@@ -63,9 +63,8 @@ def execute_request(http_connector, method, params, headers, auth, api_url, **op
     processed_params = process_params(params)
 
     api_url = smart_escape(unquote(api_url))
-
     try:
-        response = http_connector.request(method.upper(), api_url, processed_params, req_headers, **kw)
+        response = http_connector.request(method=method.upper(), url=api_url, fields=processed_params, headers=req_headers, **kw)
         body = response.data
     except HTTPError as e:
         raise GeneralError("Unexpected error %s" % str(e))

cloudinary/http_client.py

@@ -24,7 +24,7 @@ def _http_client(self):
 
     def get_json(self, url):
         try:
-            response = self._http_client.request("GET", url, timeout=self.timeout)
+            response = self._http_client.request(method="GET", url=url, timeout=self.timeout)
             body = response.data
         except HTTPError as e:
             raise GeneralError("Unexpected error %s" % str(e))

cloudinary/uploader.py

@@ -506,7 +506,7 @@ def call_api(action, params, http_headers=None, return_error=False, unsigned=Fal
 
     code = 200
     try:
-        response = _http.request("POST", api_url, param_list, headers, **kw)
+        response = _http.request(method="POST", url=api_url, fields=param_list, headers=headers, **kw)
     except HTTPError as e:
         raise Error("Unexpected error - {0!r}".format(e))
     except socket.error as e:

setup.py

@@ -60,7 +60,7 @@
       test_suite="test",
       install_requires=[
           "six",
-          "urllib3>=1.26.5,<2",
+          "urllib3>=1.26.5",
           "certifi"
       ],
       tests_require=[

test/helper_test.py

@@ -44,6 +44,15 @@
 
 ON_SUCCESS_STR = 'current_asset.update({tags: ["autocaption"]});'
 
+try:
+    # urllib3 2.x support
+    # noinspection PyProtectedMember
+    import urllib3._request_methods
+    URLLIB3_REQUEST = "urllib3._request_methods.RequestMethods.request"
+except ImportError:
+    URLLIB3_REQUEST = "urllib3.request.RequestMethods.request"
+
+
 class UTC(tzinfo):
     """UTC"""
 
@@ -58,22 +67,18 @@ def dst(self, dt):
 
 
 def get_method(mocker):
-    return mocker.call_args[0][0]
-
-
-def get_request_url(mocker):
-    return mocker.call_args[0][1]
+    return mocker.call_args[1]["method"]
 
 
-def get_uri(args):
-    return args[1]
+def get_uri(mocker):
+    return mocker.call_args[1]["url"]
 
 
-def get_headers(args):
-    return args[3] if len(args) > 3 else tuple()
+def get_headers(mocker):
+    return mocker.call_args[1]["headers"]
 
 
-def get_params(args):
+def get_params(mocker):
     """
     Extracts query parameters from mocked urllib3.request `fields` param.
     Supports both list and dict values of `fields`. Returns params as dictionary.
@@ -82,11 +87,12 @@ def get_params(args):
       - [("urls[]", "http://host1"), ("urls[]", "http://host2")]
     In both cases the result would be {"urls": ["http://host1", "http://host2"]}
     """
-    if not args or not args[2]:
+    if not mocker.call_args[1].get("fields"):
         return {}
     params = {}
     reg = re.compile(r'^(.*)\[\d*]$')
-    fields = args[2].items() if isinstance(args[2], dict) else args[2]
+    fields = mocker.call_args[1].get("fields")
+    fields = fields.items() if isinstance(fields, dict) else fields
     for k, v in fields:
         match = reg.match(k)
         if match:
@@ -110,8 +116,7 @@ def get_param(mocker, name):
     :param name: the name of the parameter
     :return: the value of the parameter if present or None
     """
-    args, kargs = mocker.call_args
-    params = get_params(args)
+    params = get_params(mocker)
     return params.get(name)