summaryrefslogtreecommitdiff
path: root/gitlab/v4/objects/commits.py
diff options
context:
space:
mode:
authorJohn L. Villalovos <john@sodarock.com>2022-01-06 00:42:47 -0800
committerJohn L. Villalovos <john@sodarock.com>2022-01-06 00:42:47 -0800
commit7555b3a663acdea99fab06baa23e48d335e7baec (patch)
tree25fe3834e8ae389cbcbd100d0817f7737ee3ad81 /gitlab/v4/objects/commits.py
parenta349793307e3a975bb51f864b48e5e9825f70182 (diff)
downloadgitlab-jlvillal/put_post_raw.tar.gz
chore: correct type-hints for http_put/http_postjlvillal/put_post_raw
http_put/http_post will either return a JSON object or nothing. We never expect them to return a raw requests.response object. Update type-hints and code to no longer have a requests.response object as a possible return value.
Diffstat (limited to 'gitlab/v4/objects/commits.py')
-rw-r--r--gitlab/v4/objects/commits.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/gitlab/v4/objects/commits.py b/gitlab/v4/objects/commits.py
index 30db0de..43b73e3 100644
--- a/gitlab/v4/objects/commits.py
+++ b/gitlab/v4/objects/commits.py
@@ -46,7 +46,7 @@ class ProjectCommit(RESTObject):
@cli.register_custom_action("ProjectCommit", ("branch",))
@exc.on_http_error(exc.GitlabCherryPickError)
- def cherry_pick(self, branch: str, **kwargs: Any) -> None:
+ def cherry_pick(self, branch: str, **kwargs: Any) -> Dict[str, Any]:
"""Cherry-pick a commit into a branch.
Args:
@@ -59,7 +59,7 @@ class ProjectCommit(RESTObject):
"""
path = f"{self.manager.path}/{self.get_id()}/cherry_pick"
post_data = {"branch": branch}
- self.manager.gitlab.http_post(path, post_data=post_data, **kwargs)
+ return self.manager.gitlab.http_post(path, post_data=post_data, **kwargs)
@cli.register_custom_action("ProjectCommit", optional=("type",))
@exc.on_http_error(exc.GitlabGetError)
@@ -103,9 +103,7 @@ class ProjectCommit(RESTObject):
@cli.register_custom_action("ProjectCommit", ("branch",))
@exc.on_http_error(exc.GitlabRevertError)
- def revert(
- self, branch: str, **kwargs: Any
- ) -> Union[Dict[str, Any], requests.Response]:
+ def revert(self, branch: str, **kwargs: Any) -> Dict[str, Any]:
"""Revert a commit on a given branch.
Args: