Skip to content

Revert "Custom cli actions fix" #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpocentek merged 1 commit into from
May 15, 2019
Merged

Revert "Custom cli actions fix" #776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gitlab/v4/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ def do_custom(self):
if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.cls):
data[self.cls._id_attr] = self.args.pop(self.cls._id_attr)
o = self.cls(self.mgr, data)
method_name = self.action.replace('-', '_')
return getattr(o, method_name)(**self.args)
else:
o = self.mgr
method_name = self.action.replace('-', '_')
return getattr(o, method_name)(**self.args)
return getattr(self.mgr, self.action)(**self.args)

def do_project_export_download(self):
try:
Expand Down Expand Up @@ -217,14 +217,14 @@ def _populate_sub_parser_by_class(cls, sub_parser):
for x in mgr_cls._from_parent_attrs]
sub_parser_action.add_argument("--sudo", required=False)

required, optional, needs_id = cli.custom_actions[name][action_name]
# We need to get the object somehow
if needs_id and gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
if cls._id_attr is not None:
id_attr = cls._id_attr.replace('_', '-')
sub_parser_action.add_argument("--%s" % id_attr,
required=True)

required, optional, dummy = cli.custom_actions[name][action_name]
[sub_parser_action.add_argument("--%s" % x.replace('_', '-'),
required=True)
for x in required if x != cls._id_attr]
Expand Down