Merge pull request python-gitlab#1412 from JohnVillalovos/jlvillal/optional_get_attrs

nejch · web-flow · commit 5b81d7d25e5d · 2021-04-26T23:53:26.000+02:00
chore: make Get.*Mixin._optional_get_attrs always present
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -75,6 +75,7 @@ class GetMixin(_RestManagerBase):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
     _obj_cls: Optional[Type[base.RESTObject]]
+    _optional_get_attrs: Tuple[str, ...] = ()
     _parent: Optional[base.RESTObject]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
@@ -119,6 +120,7 @@ class GetWithoutIdMixin(_RestManagerBase):
     _computed_path: Optional[str]
     _from_parent_attrs: Dict[str, Any]
     _obj_cls: Optional[Type[base.RESTObject]]
+    _optional_get_attrs: Tuple[str, ...] = ()
     _parent: Optional[base.RESTObject]
     _parent_attrs: Dict[str, Any]
     _path: Optional[str]
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -165,13 +165,10 @@ def _populate_sub_parser_by_class(cls, sub_parser):
                     id_attr = cls._id_attr.replace("_", "-")
                     sub_parser_action.add_argument("--%s" % id_attr, required=True)
 
-            if hasattr(mgr_cls, "_optional_get_attrs"):
-                [
-                    sub_parser_action.add_argument(
-                        "--%s" % x.replace("_", "-"), required=False
-                    )
-                    for x in mgr_cls._optional_get_attrs
-                ]
+            for x in mgr_cls._optional_get_attrs:
+                sub_parser_action.add_argument(
+                    "--%s" % x.replace("_", "-"), required=False
+                )
 
         if action_name == "create":
             for x in mgr_cls._create_attrs.required:
