python-gitlab 5.6.0__py3-none-any.whl → 6.1.0__py3-none-any.whl

gitlab/v4/objects/merge_request_approvals.py

@@ -1,7 +1,9 @@
-from typing import Any, cast, List, Optional, TYPE_CHECKING, Union
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
 
 from gitlab import exceptions as exc
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import (
     CreateMixin,
     CRUDMixin,
@@ -36,7 +38,11 @@ class GroupApprovalRule(SaveMixin, RESTObject):
     _repr_attr = "name"
 
 
-class GroupApprovalRuleManager(RetrieveMixin, CreateMixin, UpdateMixin, RESTManager):
+class GroupApprovalRuleManager(
+    RetrieveMixin[GroupApprovalRule],
+    CreateMixin[GroupApprovalRule],
+    UpdateMixin[GroupApprovalRule],
+):
     _path = "/groups/{group_id}/approval_rules"
     _obj_cls = GroupApprovalRule
     _from_parent_attrs = {"group_id": "id"}
@@ -45,17 +51,14 @@ class GroupApprovalRuleManager(RetrieveMixin, CreateMixin, UpdateMixin, RESTMana
         optional=("user_ids", "group_ids", "rule_type"),
     )
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> GroupApprovalRule:
-        return cast(GroupApprovalRule, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectApproval(SaveMixin, RESTObject):
     _id_attr = None
 
 
-class ProjectApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTManager):
+class ProjectApprovalManager(
+    GetWithoutIdMixin[ProjectApproval], UpdateMixin[ProjectApproval]
+):
     _path = "/projects/{project_id}/approvals"
     _obj_cls = ProjectApproval
     _from_parent_attrs = {"project_id": "id"}
@@ -66,13 +69,10 @@ class ProjectApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTManager):
             "disable_overriding_approvers_per_merge_request",
             "merge_requests_author_approval",
             "merge_requests_disable_committers_approval",
-        ),
+        )
     )
     _update_method = UpdateMethod.POST
 
-    def get(self, **kwargs: Any) -> ProjectApproval:
-        return cast(ProjectApproval, super().get(**kwargs))
-
 
 class ProjectApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject):
     _id_attr = "id"
@@ -80,7 +80,10 @@ class ProjectApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject):
 
 
 class ProjectApprovalRuleManager(
-    RetrieveMixin, CreateMixin, UpdateMixin, DeleteMixin, RESTManager
+    RetrieveMixin[ProjectApprovalRule],
+    CreateMixin[ProjectApprovalRule],
+    UpdateMixin[ProjectApprovalRule],
+    DeleteMixin[ProjectApprovalRule],
 ):
     _path = "/projects/{project_id}/approval_rules"
     _obj_cls = ProjectApprovalRule
@@ -90,35 +93,30 @@ class ProjectApprovalRuleManager(
         optional=("user_ids", "group_ids", "protected_branch_ids", "usernames"),
     )
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectApprovalRule:
-        return cast(ProjectApprovalRule, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectMergeRequestApproval(SaveMixin, RESTObject):
     _id_attr = None
 
 
-class ProjectMergeRequestApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTManager):
+class ProjectMergeRequestApprovalManager(
+    GetWithoutIdMixin[ProjectMergeRequestApproval],
+    UpdateMixin[ProjectMergeRequestApproval],
+):
     _path = "/projects/{project_id}/merge_requests/{mr_iid}/approvals"
     _obj_cls = ProjectMergeRequestApproval
     _from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
     _update_attrs = RequiredOptional(required=("approvals_required",))
     _update_method = UpdateMethod.POST
 
-    def get(self, **kwargs: Any) -> ProjectMergeRequestApproval:
-        return cast(ProjectMergeRequestApproval, super().get(**kwargs))
-
     @exc.on_http_error(exc.GitlabUpdateError)
     def set_approvers(
         self,
         approvals_required: int,
-        approver_ids: Optional[List[int]] = None,
-        approver_group_ids: Optional[List[int]] = None,
+        approver_ids: list[int] | None = None,
+        approver_group_ids: list[int] | None = None,
         approval_rule_name: str = "name",
         *,
-        approver_usernames: Optional[List[str]] = None,
+        approver_usernames: list[str] | None = None,
         **kwargs: Any,
     ) -> RESTObject:
         """Change MR-level allowed approvers and approver groups.
@@ -167,17 +165,14 @@ class ProjectMergeRequestApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject):
     _repr_attr = "name"
 
 
-class ProjectMergeRequestApprovalRuleManager(CRUDMixin, RESTManager):
+class ProjectMergeRequestApprovalRuleManager(
+    CRUDMixin[ProjectMergeRequestApprovalRule]
+):
     _path = "/projects/{project_id}/merge_requests/{merge_request_iid}/approval_rules"
     _obj_cls = ProjectMergeRequestApprovalRule
     _from_parent_attrs = {"project_id": "project_id", "merge_request_iid": "iid"}
     _update_attrs = RequiredOptional(
-        required=(
-            "id",
-            "merge_request_iid",
-            "name",
-            "approvals_required",
-        ),
+        required=("id", "merge_request_iid", "name", "approvals_required"),
         optional=("user_ids", "group_ids", "usernames"),
     )
     # Important: When approval_project_rule_id is set, the name, users and
@@ -188,22 +183,14 @@ class ProjectMergeRequestApprovalRuleManager(CRUDMixin, RESTManager):
         optional=("approval_project_rule_id", "user_ids", "group_ids", "usernames"),
     )
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectMergeRequestApprovalRule:
-        return cast(
-            ProjectMergeRequestApprovalRule, super().get(id=id, lazy=lazy, **kwargs)
-        )
-
 
 class ProjectMergeRequestApprovalState(RESTObject):
     pass
 
 
-class ProjectMergeRequestApprovalStateManager(GetWithoutIdMixin, RESTManager):
+class ProjectMergeRequestApprovalStateManager(
+    GetWithoutIdMixin[ProjectMergeRequestApprovalState]
+):
     _path = "/projects/{project_id}/merge_requests/{mr_iid}/approval_state"
     _obj_cls = ProjectMergeRequestApprovalState
     _from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
-
-    def get(self, **kwargs: Any) -> ProjectMergeRequestApprovalState:
-        return cast(ProjectMergeRequestApprovalState, super().get(**kwargs))

gitlab/v4/objects/merge_requests.py

@@ -4,7 +4,9 @@ https://docs.gitlab.com/ee/api/merge_requests.html
 https://docs.gitlab.com/ee/api/merge_request_approvals.html
 """
 
-from typing import Any, cast, Dict, Optional, TYPE_CHECKING, Union
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
 
 import requests
 
@@ -12,7 +14,7 @@ import gitlab
 from gitlab import cli
 from gitlab import exceptions as exc
 from gitlab import types
-from gitlab.base import RESTManager, RESTObject, RESTObjectList
+from gitlab.base import RESTObject, RESTObjectList
 from gitlab.mixins import (
     CRUDMixin,
     ListMixin,
@@ -64,7 +66,7 @@ class MergeRequest(RESTObject):
     pass
 
 
-class MergeRequestManager(ListMixin, RESTManager):
+class MergeRequestManager(ListMixin[MergeRequest]):
     _path = "/merge_requests"
     _obj_cls = MergeRequest
     _list_filters = (
@@ -111,7 +113,7 @@ class GroupMergeRequest(RESTObject):
     pass
 
 
-class GroupMergeRequestManager(ListMixin, RESTManager):
+class GroupMergeRequestManager(ListMixin[GroupMergeRequest]):
     _path = "/groups/{group_id}/merge_requests"
     _obj_cls = GroupMergeRequest
     _from_parent_attrs = {"group_id": "id"}
@@ -159,7 +161,7 @@ class ProjectMergeRequest(
     approval_state: ProjectMergeRequestApprovalStateManager
     approvals: ProjectMergeRequestApprovalManager
     awardemojis: ProjectMergeRequestAwardEmojiManager
-    diffs: "ProjectMergeRequestDiffManager"
+    diffs: ProjectMergeRequestDiffManager
     discussions: ProjectMergeRequestDiscussionManager
     draft_notes: ProjectMergeRequestDraftNoteManager
     notes: ProjectMergeRequestNoteManager
@@ -172,7 +174,7 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabMROnBuildSuccessError)
-    def cancel_merge_when_pipeline_succeeds(self, **kwargs: Any) -> Dict[str, str]:
+    def cancel_merge_when_pipeline_succeeds(self, **kwargs: Any) -> dict[str, str]:
         """Cancel merge when the pipeline succeeds.
 
         Args:
@@ -201,11 +203,11 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabListError)
-    def related_issues(self, **kwargs: Any) -> RESTObjectList:
+    def related_issues(self, **kwargs: Any) -> RESTObjectList[ProjectIssue]:
         """List issues related to this merge request."
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -230,11 +232,11 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabListError)
-    def closes_issues(self, **kwargs: Any) -> RESTObjectList:
+    def closes_issues(self, **kwargs: Any) -> RESTObjectList[ProjectIssue]:
         """List issues that will close on merge."
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -255,11 +257,11 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabListError)
-    def commits(self, **kwargs: Any) -> RESTObjectList:
+    def commits(self, **kwargs: Any) -> RESTObjectList[ProjectCommit]:
         """List the merge request commits.
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -283,7 +285,7 @@ class ProjectMergeRequest(
         cls_names="ProjectMergeRequest", optional=("access_raw_diffs",)
     )
     @exc.on_http_error(exc.GitlabListError)
-    def changes(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
+    def changes(self, **kwargs: Any) -> dict[str, Any] | requests.Response:
         """List the merge request changes.
 
         Args:
@@ -301,7 +303,7 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest", optional=("sha",))
     @exc.on_http_error(exc.GitlabMRApprovalError)
-    def approve(self, sha: Optional[str] = None, **kwargs: Any) -> Dict[str, Any]:
+    def approve(self, sha: str | None = None, **kwargs: Any) -> dict[str, Any]:
         """Approve the merge request.
 
         Args:
@@ -343,7 +345,7 @@ class ProjectMergeRequest(
         https://docs.gitlab.com/ee/api/merge_request_approvals.html#unapprove-merge-request
         """
         path = f"{self.manager.path}/{self.encoded_id}/unapprove"
-        data: Dict[str, Any] = {}
+        data: dict[str, Any] = {}
 
         server_data = self.manager.gitlab.http_post(path, post_data=data, **kwargs)
         if TYPE_CHECKING:
@@ -352,7 +354,7 @@ class ProjectMergeRequest(
 
     @cli.register_custom_action(cls_names="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] | requests.Response:
         """Attempt to rebase the source branch onto the target branch
 
         Args:
@@ -363,14 +365,12 @@ class ProjectMergeRequest(
             GitlabMRRebaseError: If rebasing failed
         """
         path = f"{self.manager.path}/{self.encoded_id}/rebase"
-        data: Dict[str, Any] = {}
+        data: dict[str, Any] = {}
         return self.manager.gitlab.http_put(path, post_data=data, **kwargs)
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabMRResetApprovalError)
-    def reset_approvals(
-        self, **kwargs: Any
-    ) -> Union[Dict[str, Any], requests.Response]:
+    def reset_approvals(self, **kwargs: Any) -> dict[str, Any] | requests.Response:
         """Clear all approvals of the merge request.
 
         Args:
@@ -381,12 +381,12 @@ class ProjectMergeRequest(
             GitlabMRResetApprovalError: If reset approval failed
         """
         path = f"{self.manager.path}/{self.encoded_id}/reset_approvals"
-        data: Dict[str, Any] = {}
+        data: dict[str, Any] = {}
         return self.manager.gitlab.http_put(path, post_data=data, **kwargs)
 
     @cli.register_custom_action(cls_names="ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabGetError)
-    def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
+    def merge_ref(self, **kwargs: Any) -> dict[str, Any] | requests.Response:
         """Attempt to merge changes between source and target branches into
             `refs/merge-requests/:iid/merge`.
 
@@ -410,11 +410,11 @@ class ProjectMergeRequest(
     @exc.on_http_error(exc.GitlabMRClosedError)
     def merge(
         self,
-        merge_commit_message: Optional[str] = None,
-        should_remove_source_branch: Optional[bool] = None,
-        merge_when_pipeline_succeeds: Optional[bool] = None,
+        merge_commit_message: str | None = None,
+        should_remove_source_branch: bool | None = None,
+        merge_when_pipeline_succeeds: bool | None = None,
         **kwargs: Any,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Accept the merge request.
 
         Args:
@@ -430,7 +430,7 @@ class ProjectMergeRequest(
             GitlabMRClosedError: If the merge failed
         """
         path = f"{self.manager.path}/{self.encoded_id}/merge"
-        data: Dict[str, Any] = {}
+        data: dict[str, Any] = {}
         if merge_commit_message:
             data["merge_commit_message"] = merge_commit_message
         if should_remove_source_branch is not None:
@@ -445,7 +445,7 @@ class ProjectMergeRequest(
         return server_data
 
 
-class ProjectMergeRequestManager(CRUDMixin, RESTManager):
+class ProjectMergeRequestManager(CRUDMixin[ProjectMergeRequest]):
     _path = "/projects/{project_id}/merge_requests"
     _obj_cls = ProjectMergeRequest
     _from_parent_attrs = {"project_id": "id"}
@@ -485,7 +485,7 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):
             "allow_maintainer_to_push",
             "squash",
             "reviewer_ids",
-        ),
+        )
     )
     _list_filters = (
         "state",
@@ -517,11 +517,6 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):
         "labels": types.CommaSeparatedListAttribute,
     }
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectMergeRequest:
-        return cast(ProjectMergeRequest, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectDeploymentMergeRequest(MergeRequest):
     pass
@@ -537,12 +532,7 @@ class ProjectMergeRequestDiff(RESTObject):
     pass
 
 
-class ProjectMergeRequestDiffManager(RetrieveMixin, RESTManager):
+class ProjectMergeRequestDiffManager(RetrieveMixin[ProjectMergeRequestDiff]):
     _path = "/projects/{project_id}/merge_requests/{mr_iid}/versions"
     _obj_cls = ProjectMergeRequestDiff
     _from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
-
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectMergeRequestDiff:
-        return cast(ProjectMergeRequestDiff, super().get(id=id, lazy=lazy, **kwargs))

gitlab/v4/objects/merge_trains.py

@@ -1,17 +1,14 @@
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import ListMixin
 
-__all__ = [
-    "ProjectMergeTrain",
-    "ProjectMergeTrainManager",
-]
+__all__ = ["ProjectMergeTrain", "ProjectMergeTrainManager"]
 
 
 class ProjectMergeTrain(RESTObject):
     pass
 
 
-class ProjectMergeTrainManager(ListMixin, RESTManager):
+class ProjectMergeTrainManager(ListMixin[ProjectMergeTrain]):
     _path = "/projects/{project_id}/merge_trains"
     _obj_cls = ProjectMergeTrain
     _from_parent_attrs = {"project_id": "id"}

gitlab/v4/objects/milestones.py

@@ -1,9 +1,10 @@
-from typing import Any, cast, TYPE_CHECKING, Union
+from typing import Any, TYPE_CHECKING
 
 from gitlab import cli
 from gitlab import exceptions as exc
 from gitlab import types
-from gitlab.base import RESTManager, RESTObject, RESTObjectList
+from gitlab.base import RESTObject, RESTObjectList
+from gitlab.client import GitlabList
 from gitlab.mixins import (
     CRUDMixin,
     ObjectDeleteMixin,
@@ -16,6 +17,7 @@ from gitlab.types import RequiredOptional
 from .issues import GroupIssue, GroupIssueManager, ProjectIssue, ProjectIssueManager
 from .merge_requests import (
     GroupMergeRequest,
+    GroupMergeRequestManager,
     ProjectMergeRequest,
     ProjectMergeRequestManager,
 )
@@ -33,11 +35,11 @@ class GroupMilestone(SaveMixin, ObjectDeleteMixin, RESTObject):
 
     @cli.register_custom_action(cls_names="GroupMilestone")
     @exc.on_http_error(exc.GitlabListError)
-    def issues(self, **kwargs: Any) -> RESTObjectList:
+    def issues(self, **kwargs: Any) -> RESTObjectList[GroupIssue]:
         """List issues related to this milestone.
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -53,18 +55,18 @@ class GroupMilestone(SaveMixin, ObjectDeleteMixin, RESTObject):
         path = f"{self.manager.path}/{self.encoded_id}/issues"
         data_list = self.manager.gitlab.http_list(path, iterator=True, **kwargs)
         if TYPE_CHECKING:
-            assert isinstance(data_list, RESTObjectList)
+            assert isinstance(data_list, GitlabList)
         manager = GroupIssueManager(self.manager.gitlab, parent=self.manager._parent)
         # FIXME(gpocentek): the computed manager path is not correct
         return RESTObjectList(manager, GroupIssue, data_list)
 
     @cli.register_custom_action(cls_names="GroupMilestone")
     @exc.on_http_error(exc.GitlabListError)
-    def merge_requests(self, **kwargs: Any) -> RESTObjectList:
+    def merge_requests(self, **kwargs: Any) -> RESTObjectList[GroupMergeRequest]:
         """List the merge requests related to this milestone.
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -79,13 +81,15 @@ class GroupMilestone(SaveMixin, ObjectDeleteMixin, RESTObject):
         path = f"{self.manager.path}/{self.encoded_id}/merge_requests"
         data_list = self.manager.gitlab.http_list(path, iterator=True, **kwargs)
         if TYPE_CHECKING:
-            assert isinstance(data_list, RESTObjectList)
-        manager = GroupIssueManager(self.manager.gitlab, parent=self.manager._parent)
+            assert isinstance(data_list, GitlabList)
+        manager = GroupMergeRequestManager(
+            self.manager.gitlab, parent=self.manager._parent
+        )
         # FIXME(gpocentek): the computed manager path is not correct
         return RESTObjectList(manager, GroupMergeRequest, data_list)
 
 
-class GroupMilestoneManager(CRUDMixin, RESTManager):
+class GroupMilestoneManager(CRUDMixin[GroupMilestone]):
     _path = "/groups/{group_id}/milestones"
     _obj_cls = GroupMilestone
     _from_parent_attrs = {"group_id": "id"}
@@ -93,16 +97,11 @@ class GroupMilestoneManager(CRUDMixin, RESTManager):
         required=("title",), optional=("description", "due_date", "start_date")
     )
     _update_attrs = RequiredOptional(
-        optional=("title", "description", "due_date", "start_date", "state_event"),
+        optional=("title", "description", "due_date", "start_date", "state_event")
     )
     _list_filters = ("iids", "state", "search")
     _types = {"iids": types.ArrayAttribute}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> GroupMilestone:
-        return cast(GroupMilestone, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectMilestone(PromoteMixin, SaveMixin, ObjectDeleteMixin, RESTObject):
     _repr_attr = "title"
@@ -110,11 +109,11 @@ class ProjectMilestone(PromoteMixin, SaveMixin, ObjectDeleteMixin, RESTObject):
 
     @cli.register_custom_action(cls_names="ProjectMilestone")
     @exc.on_http_error(exc.GitlabListError)
-    def issues(self, **kwargs: Any) -> RESTObjectList:
+    def issues(self, **kwargs: Any) -> RESTObjectList[ProjectIssue]:
         """List issues related to this milestone.
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -130,18 +129,18 @@ class ProjectMilestone(PromoteMixin, SaveMixin, ObjectDeleteMixin, RESTObject):
         path = f"{self.manager.path}/{self.encoded_id}/issues"
         data_list = self.manager.gitlab.http_list(path, iterator=True, **kwargs)
         if TYPE_CHECKING:
-            assert isinstance(data_list, RESTObjectList)
+            assert isinstance(data_list, GitlabList)
         manager = ProjectIssueManager(self.manager.gitlab, parent=self.manager._parent)
         # FIXME(gpocentek): the computed manager path is not correct
         return RESTObjectList(manager, ProjectIssue, data_list)
 
     @cli.register_custom_action(cls_names="ProjectMilestone")
     @exc.on_http_error(exc.GitlabListError)
-    def merge_requests(self, **kwargs: Any) -> RESTObjectList:
+    def merge_requests(self, **kwargs: Any) -> RESTObjectList[ProjectMergeRequest]:
         """List the merge requests related to this milestone.
 
         Args:
-            all: If True, return all the items, without pagination
+            get_all: If True, return all the items, without pagination
             per_page: Number of items to retrieve per request
             page: ID of the page to return (starts with page 1)
             **kwargs: Extra options to send to the server (e.g. sudo)
@@ -156,7 +155,7 @@ class ProjectMilestone(PromoteMixin, SaveMixin, ObjectDeleteMixin, RESTObject):
         path = f"{self.manager.path}/{self.encoded_id}/merge_requests"
         data_list = self.manager.gitlab.http_list(path, iterator=True, **kwargs)
         if TYPE_CHECKING:
-            assert isinstance(data_list, RESTObjectList)
+            assert isinstance(data_list, GitlabList)
         manager = ProjectMergeRequestManager(
             self.manager.gitlab, parent=self.manager._parent
         )
@@ -164,7 +163,7 @@ class ProjectMilestone(PromoteMixin, SaveMixin, ObjectDeleteMixin, RESTObject):
         return RESTObjectList(manager, ProjectMergeRequest, data_list)
 
 
-class ProjectMilestoneManager(CRUDMixin, RESTManager):
+class ProjectMilestoneManager(CRUDMixin[ProjectMilestone]):
     _path = "/projects/{project_id}/milestones"
     _obj_cls = ProjectMilestone
     _from_parent_attrs = {"project_id": "id"}
@@ -173,12 +172,7 @@ class ProjectMilestoneManager(CRUDMixin, RESTManager):
         optional=("description", "due_date", "start_date", "state_event"),
     )
     _update_attrs = RequiredOptional(
-        optional=("title", "description", "due_date", "start_date", "state_event"),
+        optional=("title", "description", "due_date", "start_date", "state_event")
     )
     _list_filters = ("iids", "state", "search")
     _types = {"iids": types.ArrayAttribute}
-
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectMilestone:
-        return cast(ProjectMilestone, super().get(id=id, lazy=lazy, **kwargs))

gitlab/v4/objects/namespaces.py

@@ -1,29 +1,23 @@
-from typing import Any, cast, TYPE_CHECKING, Union
+from typing import Any, TYPE_CHECKING
 
 from gitlab import cli
 from gitlab import exceptions as exc
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import RetrieveMixin
 from gitlab.utils import EncodedId
 
-__all__ = [
-    "Namespace",
-    "NamespaceManager",
-]
+__all__ = ["Namespace", "NamespaceManager"]
 
 
 class Namespace(RESTObject):
     pass
 
 
-class NamespaceManager(RetrieveMixin, RESTManager):
+class NamespaceManager(RetrieveMixin[Namespace]):
     _path = "/namespaces"
     _obj_cls = Namespace
     _list_filters = ("search",)
 
-    def get(self, id: Union[str, int], lazy: bool = False, **kwargs: Any) -> Namespace:
-        return cast(Namespace, super().get(id=id, lazy=lazy, **kwargs))
-
     @cli.register_custom_action(
         cls_names="NamespaceManager", required=("namespace", "parent_id")
     )