fix: support int for parent_id in import_group

JohnVillalovos · JohnVillalovos · commit 2d1382fe561b · 2023-03-04T14:45:36.000-08:00
This will also fix other use cases where an integer is passed in to MultipartEncoder. Added unit tests to show it works. Closes: #2506
diff --git a/gitlab/_backends/requests_backend.py b/gitlab/_backends/requests_backend.py
@@ -75,7 +75,7 @@ def prepare_send_data(
                 if TYPE_CHECKING:
                     assert isinstance(post_data, dict)
                 for k, v in post_data.items():
-                    if isinstance(v, bool):
+                    if isinstance(v, (bool, int)):
                         post_data[k] = str(int(v))
             post_data["file"] = files.get("file")
             post_data["avatar"] = files.get("avatar")
diff --git a/gitlab/v4/objects/groups.py b/gitlab/v4/objects/groups.py
@@ -378,7 +378,7 @@ def import_group(
         file: BinaryIO,
         path: str,
         name: str,
-        parent_id: Optional[str] = None,
+        parent_id: Optional[Union[int, str]] = None,
         **kwargs: Any,
     ) -> Union[Dict[str, Any], requests.Response]:
         """Import a group from an archive file.
@@ -399,7 +399,7 @@ def import_group(
             A representation of the import status.
         """
         files = {"file": ("file.tar.gz", file, "application/octet-stream")}
-        data = {"path": path, "name": name}
+        data: Dict[str, Any] = {"path": path, "name": name}
         if parent_id is not None:
             data["parent_id"] = parent_id
 
diff --git a/tests/unit/_backends/test_requests_backend.py b/tests/unit/_backends/test_requests_backend.py
@@ -36,3 +36,15 @@ def test_prepare_send_data_str_parentid(self) -> None:
         assert result.json is None
         assert result.content_type.startswith("multipart/form-data")
         assert isinstance(result.data, MultipartEncoder)
+
+    def test_prepare_send_data_int_parentid(self) -> None:
+        file = "12345"
+        files = {"file": ("file.tar.gz", file, "application/octet-stream")}
+        post_data = {"parent_id": 12}
+
+        result = requests_backend.RequestsBackend.prepare_send_data(
+            files=files, post_data=post_data, raw=False
+        )
+        assert result.json is None
+        assert result.content_type.startswith("multipart/form-data")
+        assert isinstance(result.data, MultipartEncoder)
