Bump pycloudinary to 1.36.0

Author: const-cloudinary

requirements.txt

@@ -1,4 +1,4 @@
-cloudinary>=1.35.0
+cloudinary>=1.36.0
 pygments
 jinja2
 click

test/helper_test.py

@@ -15,6 +15,14 @@
 RESOURCES_DIR = Path.joinpath(Path(__file__).resolve().parent, "resources")
 TEST_FILES_DIR = str(Path.joinpath(RESOURCES_DIR, "test_sync"))
 
+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"
+
 disable_warnings()
 
 
@@ -49,7 +57,7 @@ def uploader_response_mock():
 
 
 def get_request_url(mocker):
-    return mocker.call_args[0][1]
+    return mocker.call_args[1]["url"]
 
 
 def get_params(mocker):
@@ -62,12 +70,12 @@ def get_params(mocker):
     In both cases the result would be {"urls": ["http://host1", "http://host2"]}
     """
 
-    args = mocker.call_args[0]
-    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:

test/test_cli_api.py

@@ -6,7 +6,7 @@
 from click.testing import CliRunner
 
 from cloudinary_cli.cli import cli
-from test.helper_test import api_response_mock, uploader_response_mock
+from test.helper_test import api_response_mock, uploader_response_mock, URLLIB3_REQUEST
 
 API_MOCK_RESPONSE = api_response_mock()
 UPLOAD_MOCK_RESPONSE = uploader_response_mock()
@@ -15,23 +15,23 @@
 class TestCLIApi(unittest.TestCase):
     runner = CliRunner()
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     def test_admin(self, mocker):
         mocker.return_value = API_MOCK_RESPONSE
         result = self.runner.invoke(cli, ['ping'])
 
         self.assertEqual(0, result.exit_code, result.output)
         self.assertIn('"foo": "bar"', result.output)
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     def test_upload(self, mocker):
         mocker.return_value = UPLOAD_MOCK_RESPONSE
         result = self.runner.invoke(cli, ['upload', os.path.abspath(__file__)])
 
         self.assertEqual(0, result.exit_code, result.output)
         self.assertIn('"foo": "bar"', result.output)
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     @unittest.skipUnless(cloudinary.provisioning.account_config().account_id, "requires account_id")
     def test_provisioning(self, mocker):
         mocker.return_value = API_MOCK_RESPONSE

test/test_cli_search_api.py

@@ -4,7 +4,7 @@
 from click.testing import CliRunner
 
 from cloudinary_cli.cli import cli
-from test.helper_test import api_response_mock, uploader_response_mock
+from test.helper_test import api_response_mock, uploader_response_mock, URLLIB3_REQUEST
 
 API_MOCK_RESPONSE = api_response_mock()
 UPLOAD_MOCK_RESPONSE = uploader_response_mock()
@@ -13,7 +13,7 @@
 class TestCLISearchApi(unittest.TestCase):
     runner = CliRunner()
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     def test_search(self, mocker):
         mocker.return_value = API_MOCK_RESPONSE
         result = self.runner.invoke(cli, ['search', 'cat'])

test/test_modules/test_cli_sync.py

@@ -8,7 +8,7 @@
 
 from cloudinary_cli.cli import cli
 from test.helper_test import unique_suffix, RESOURCES_DIR, TEST_FILES_DIR, delete_cld_folder_if_exists, retry_assertion, \
-    get_request_url, get_params
+    get_request_url, get_params, URLLIB3_REQUEST
 from test.test_modules.test_cli_upload_dir import UPLOAD_MOCK_RESPONSE
 
 
@@ -126,7 +126,7 @@ def _upload_sync_files(self, dir):
         self.assertIn("Synced | 12", result.output)
         self.assertIn("Done!", result.output)
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     def test_sync_override_defaults(self, mocker):
         mocker.return_value = UPLOAD_MOCK_RESPONSE
 

test/test_modules/test_cli_upload_dir.py

@@ -6,7 +6,7 @@
 
 from cloudinary_cli.cli import cli
 from test.helper_test import unique_suffix, TEST_FILES_DIR, delete_cld_folder_if_exists, uploader_response_mock, \
-    get_request_url, get_params
+    get_request_url, get_params, URLLIB3_REQUEST
 
 UPLOAD_MOCK_RESPONSE = uploader_response_mock()
 
@@ -58,7 +58,7 @@ def test_upload_dir_with_exclude_dir_name_option(self):
         self.assertIn("as " + self.CLD_UPLOAD_DIR, result.output)
         self.assertNotIn("as " + self.CLD_UPLOAD_DIR + "/test_sync/", result.output)
 
-    @patch('urllib3.request.RequestMethods.request')
+    @patch(URLLIB3_REQUEST)
     def test_upload_dir_override_defaults(self, mocker):
         mocker.return_value = UPLOAD_MOCK_RESPONSE