summaryrefslogtreecommitdiff
path: root/gitlab/v4/objects/merge_requests.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/merge_requests.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/merge_requests.py')
-rw-r--r--gitlab/v4/objects/merge_requests.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
index 11c962b..02221ee 100644
--- a/gitlab/v4/objects/merge_requests.py
+++ b/gitlab/v4/objects/merge_requests.py
@@ -185,8 +185,6 @@ class ProjectMergeRequest(
f"{self.manager.path}/{self.get_id()}/cancel_merge_when_pipeline_succeeds"
)
server_data = self.manager.gitlab.http_put(path, **kwargs)
- if TYPE_CHECKING:
- assert isinstance(server_data, dict)
self._update_attrs(server_data)
return ProjectMergeRequest(self.manager, server_data)
@@ -287,8 +285,6 @@ class ProjectMergeRequest(
data["sha"] = sha
server_data = self.manager.gitlab.http_post(path, post_data=data, **kwargs)
- if TYPE_CHECKING:
- assert isinstance(server_data, dict)
self._update_attrs(server_data)
return server_data
@@ -310,13 +306,11 @@ class ProjectMergeRequest(
data: Dict[str, Any] = {}
server_data = self.manager.gitlab.http_post(path, post_data=data, **kwargs)
- if TYPE_CHECKING:
- assert isinstance(server_data, dict)
self._update_attrs(server_data)
@cli.register_custom_action("ProjectMergeRequest")
@exc.on_http_error(exc.GitlabMRRebaseError)
- def rebase(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
+ def rebase(self, **kwargs: Any) -> Dict[str, Any]:
"""Attempt to rebase the source branch onto the target branch
Args:
@@ -386,8 +380,6 @@ class ProjectMergeRequest(
data["merge_when_pipeline_succeeds"] = True
server_data = self.manager.gitlab.http_put(path, post_data=data, **kwargs)
- if TYPE_CHECKING:
- assert isinstance(server_data, dict)
self._update_attrs(server_data)
return server_data