Remove duplicate type definitions in middle-level abstract classes

vectro · vectro · commit bd64572c5cf2 · 2022-06-11T17:34:50.000-07:00
diff --git a/gitlab/base.py b/gitlab/base.py
@@ -328,8 +328,10 @@ def total(self) -> Optional[int]:
         """The total number of items."""
         return self._list.total
 
+T_obj = TypeVar("T_obj", bound=RESTObject)
+T_parent = TypeVar("T_parent", bound=Optional[RESTObject])
 
-class RESTManager:
+class RESTManager(Generic[T_obj, T_parent]):
     """Base class for CRUD operations on objects.
 
     Derived class must define ``_path`` and ``_obj_cls``.
@@ -341,16 +343,16 @@ class RESTManager:
     _create_attrs: g_types.RequiredOptional = g_types.RequiredOptional()
     _update_attrs: g_types.RequiredOptional = g_types.RequiredOptional()
     _path: Optional[str] = None
-    _obj_cls: Optional[Type[RESTObject]] = None
+    _obj_cls: Type[T_obj]
     _from_parent_attrs: Dict[str, Any] = {}
     _types: Dict[str, Type[g_types.GitlabAttribute]] = {}
 
     _computed_path: Optional[str]
-    _parent: Optional[RESTObject]
+    _parent: Optional[T_parent]
     _parent_attrs: Dict[str, Any]
     gitlab: Gitlab
 
-    def __init__(self, gl: Gitlab, parent: Optional[RESTObject] = None) -> None:
+    def __init__(self, gl: Gitlab, parent: Optional[T_parent] = None) -> None:
         """REST manager constructor.
 
         Args:
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -70,24 +70,22 @@
     _RestManagerBase = object
     _RestObjectBase = object
 
-T1 = TypeVar("T1", bound=base.RESTObject)
-T2 = TypeVar("T2", bound=base.RESTObject)
+T_obj = TypeVar("T_obj", bound=base.RESTObject)
+T_parent = TypeVar("T_parent", bound=Optional[base.RESTObject])
 
 
-class GetMixin(_RestManagerBase, Generic[T1, T2]):
+class GetMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
     _optional_get_attrs: Tuple[str, ...] = ()
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
 
     @exc.on_http_error(exc.GitlabGetError)
     def get(
         self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> T1:
+    ) -> T_obj:
         """Retrieve a single object.
 
         Args:
@@ -119,12 +117,10 @@ def get(
         return self._obj_cls(self, server_data)
 
 
-class GetWithoutIdMixin(_RestManagerBase, Generic[T1, T2]):
+class GetWithoutIdMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
     _optional_get_attrs: Tuple[str, ...] = ()
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
@@ -187,18 +183,16 @@ def refresh(self, **kwargs: Any) -> None:
         self._update_attrs(server_data)
 
 
-class ListMixin(_RestManagerBase, Generic[T1, T2]):
+class ListMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
     _list_filters: Tuple[str, ...] = ()
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
 
     @exc.on_http_error(exc.GitlabListError)
-    def list(self, **kwargs: Any) -> Iterable[T1]:
+    def list(self, **kwargs: Any) -> Iterable[T_obj]:
         """Retrieve a list of objects.
 
         Args:
@@ -240,21 +234,17 @@ def list(self, **kwargs: Any) -> Iterable[T1]:
         return base.RESTObjectList(self, self._obj_cls, obj)
 
 
-class RetrieveMixin(ListMixin, GetMixin, Generic[T1, T2]):
+class RetrieveMixin(ListMixin[T_obj, T_parent], GetMixin[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
 
 
-class CreateMixin(_RestManagerBase, Generic[T1, T2]):
+class CreateMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
@@ -293,11 +283,9 @@ def create(
         return self._obj_cls(self, server_data)
 
 
-class UpdateMixin(_RestManagerBase, Generic[T1, T2]):
+class UpdateMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     _update_uses_post: bool = False
@@ -358,11 +346,9 @@ def update(
         return result
 
 
-class SetMixin(_RestManagerBase, Generic[T1, T2]):
+class SetMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
@@ -392,11 +378,9 @@ def set(self, key: str, value: str, **kwargs: Any) -> base.RESTObject:
         return self._obj_cls(self, server_data)
 
 
-class DeleteMixin(_RestManagerBase, Generic[T1, T2]):
+class DeleteMixin(_RestManagerBase[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
@@ -423,21 +407,17 @@ def delete(self, id: Optional[Union[str, int]] = None, **kwargs: Any) -> None:
         self.gitlab.http_delete(path, **kwargs)
 
 
-class CRUDMixin(GetMixin, ListMixin, CreateMixin, UpdateMixin, DeleteMixin, Generic[T1, T2]):
+class CRUDMixin(GetMixin[T_obj, T_parent], ListMixin[T_obj, T_parent], CreateMixin[T_obj, T_parent], UpdateMixin[T_obj, T_parent], DeleteMixin[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: Optional[T2]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
 
 
-class NoUpdateMixin(GetMixin, ListMixin, CreateMixin, DeleteMixin, Generic[T1, T2]):
+class NoUpdateMixin(GetMixin[T_obj, T_parent], ListMixin[T_obj, T_parent], CreateMixin[T_obj, T_parent], DeleteMixin[T_obj, T_parent], Generic[T_obj, T_parent]):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
-    _obj_cls: Type[T1]
-    _parent: T2
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
     gitlab: gitlab.Gitlab
@@ -838,7 +818,7 @@ def participants(self, **kwargs: Any) -> Dict[str, Any]:
         return result
 
 
-class BadgeRenderMixin(_RestManagerBase):
+class BadgeRenderMixin(_RestManagerBase[T_obj, T_parent]):
     @cli.register_custom_action(
         ("GroupBadgeManager", "ProjectBadgeManager"), ("link_url", "image_url")
     )
