fix: not re-implement inherited functions in ScopesListAttribute, add _types to objects

klorenz · klorenz · commit 85757d80daee · 2021-03-07T13:10:44.000+01:00
diff --git a/gitlab/types.py b/gitlab/types.py
@@ -46,14 +46,9 @@ def get_for_api(self):
 
 
 class ScopesListAttribute(ListAttribute):
-    def set_from_cli(self, cli_value):
-        if not cli_value.strip():
-            self._value = []
-        else:
-            self._value = [item.strip() for item in cli_value.split(",")]
 
     def get_for_api(self):
-        # Do not comma-split single value passed as string
+        # scopes are expected to be a list of strings
         if isinstance(self._value, str):
             return [self._value]
 
diff --git a/gitlab/v4/objects/applications.py b/gitlab/v4/objects/applications.py
@@ -1,5 +1,6 @@
 from gitlab.base import RESTManager, RESTObject
 from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin
+from gitlab.types import ScopesListAttribute
 
 __all__ = [
     "Application",
@@ -16,3 +17,5 @@ class ApplicationManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
     _path = "/applications"
     _obj_cls = Application
     _create_attrs = (("name", "redirect_uri", "scopes"), ("confidential",))
+
+    _types = {"scopes": ScopesListAttribute}
diff --git a/gitlab/v4/objects/deploy_tokens.py b/gitlab/v4/objects/deploy_tokens.py
@@ -1,6 +1,6 @@
 from gitlab.base import RESTManager, RESTObject
 from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin
-
+from gitlab.types import ScopesListAttribute
 
 __all__ = [
     "DeployToken",
@@ -39,6 +39,7 @@ class GroupDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
             "username",
         ),
     )
+    _types = {"scopes": ScopesListAttribute}
 
 
 class ProjectDeployToken(ObjectDeleteMixin, RESTObject):
@@ -59,3 +60,4 @@ class ProjectDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager
             "username",
         ),
     )
+    _types = {"scopes": ScopesListAttribute}
diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py
@@ -13,6 +13,7 @@
     SaveMixin,
     UpdateMixin,
 )
+from gitlab.types import ScopesListAttribute
 
 from .custom_attributes import UserCustomAttributeManager
 from .events import UserEventManager
@@ -406,6 +407,7 @@ class UserImpersonationTokenManager(NoUpdateMixin, RESTManager):
     _from_parent_attrs = {"user_id": "id"}
     _create_attrs = (("name", "scopes"), ("expires_at",))
     _list_filters = ("state",)
+    _types = {"scopes": ScopesListAttribute}
 
 
 class UserMembership(RESTObject):
