Remove duplicate call

Author: adam-lebon

ctfcli/core/api.py

@@ -74,22 +74,19 @@ def request(self, method, url, data=None, files=None, *args, **kwargs):
                 **kwargs,
             )
 
-        # If data or files are not key/value pairs, then send the raw values
-        if data is not None or files is not None:
-            return super(API, self).request(
-                method,
-                url,
-                data=data,
-                files=files,
-                *args,
-                **kwargs,
-            )
-
         # otherwise set the content-type to application/json for all API requests
         # modify the headers here instead of using self.headers because we don't want to
         # override the multipart/form-data case above
-        if kwargs.get("headers", None) is None:
-            kwargs["headers"] = {}
-
-        kwargs["headers"]["Content-Type"] = "application/json"
-        return super(API, self).request(method, url, *args, **kwargs)
+        if data is None and files is None:
+            if kwargs.get("headers", None) is None:
+                kwargs["headers"] = {}
+            kwargs["headers"]["Content-Type"] = "application/json"
+
+        return super(API, self).request(
+            method,
+            url,
+            data=data,
+            files=files,
+            *args,
+            **kwargs,
+        )

tests/core/test_api.py

@@ -46,8 +46,20 @@ def test_api_object_request_strips_preceding_slash_from_url_path(self, mock_requ
 
         mock_request.assert_has_calls(
             [
-                call("GET", "https://example.com/test/path", headers={"Content-Type": "application/json"}),
-                call("GET", "https://example.com/test/path", headers={"Content-Type": "application/json"}),
+                call(
+                    "GET",
+                    "https://example.com/test/path",
+                    headers={"Content-Type": "application/json"},
+                    data=None,
+                    files=None,
+                ),
+                call(
+                    "GET",
+                    "https://example.com/test/path",
+                    headers={"Content-Type": "application/json"},
+                    data=None,
+                    files=None,
+                ),
             ]
         )
 
@@ -60,7 +72,7 @@ def test_api_object_request_assigns_prefix_url(self, mock_request: MagicMock, *a
         api = API()
         api.request("GET", "path")
         mock_request.assert_called_once_with(
-            "GET", "https://example.com/test/path", headers={"Content-Type": "application/json"}
+            "GET", "https://example.com/test/path", headers={"Content-Type": "application/json"}, data=None, files=None
         )
 
     def test_api_object_assigns_ssl_verify(self, *args, **kwargs):