Merge pull request #776 from python-gitlab/revert-760-custom_cli_acti… · python-gitlab/python-gitlab@ef32990 · GitHub

1. python-gitlab
2. python-gitlab

Repository navigation

• Code
• Issues16 (16)
• Pull requests15 (15)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit ef32990

Browse filesBrowse the repository at this point in the historyBrowse files

gpocentek

authored

Merge pull request #776 from python-gitlab/revert-760-custom_cli_actions_fix

Revert "Custom cli actions fix"

2 parents e8823e9 + d3a20c5 commit ef32990
Copy full SHA for ef32990

1 file changed

+5-5Lines changed: 5 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• gitlab/v4
  • cli.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎gitlab/v4/cli.py‎

Copy file name to clipboardExpand all lines: gitlab/v4/cli.py

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -80,10 +80,10 @@ def do_custom(self):
80	80	if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.cls):
81	81	data[self.cls._id_attr] = self.args.pop(self.cls._id_attr)
82	82	o = self.cls(self.mgr, data)
	83	+ method_name = self.action.replace('-', '_')
	84	+ return getattr(o, method_name)(**self.args)
83	85	else:
84		- o = self.mgr
85		- method_name = self.action.replace('-', '_')
86		- return getattr(o, method_name)(**self.args)
	86	+ return getattr(self.mgr, self.action)(**self.args)
87	87
88	88	def do_project_export_download(self):
89	89	try:
@@ -217,14 +217,14 @@ def _populate_sub_parser_by_class(cls, sub_parser):
217	217	for x in mgr_cls._from_parent_attrs]
218	218	sub_parser_action.add_argument("--sudo", required=False)
219	219
220		- required, optional, needs_id = cli.custom_actions[name][action_name]
221	220	# We need to get the object somehow
222		- if needs_id and gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
	221	+ if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
223	222	if cls._id_attr is not None:
224	223	id_attr = cls._id_attr.replace('_', '-')
225	224	sub_parser_action.add_argument("--%s" % id_attr,
226	225	required=True)
227	226
	227	+ required, optional, dummy = cli.custom_actions[name][action_name]
228	228	[sub_parser_action.add_argument("--%s" % x.replace('_', '-'),
229	229	required=True)
230	230	for x in required if x != cls._id_attr]

0 commit comments

Comments

0 (0)